diff --git a/mozilla/layout/generic/nsImageFrame.cpp b/mozilla/layout/generic/nsImageFrame.cpp index 1a335b48e45..7dec800cc0e 100644 --- a/mozilla/layout/generic/nsImageFrame.cpp +++ b/mozilla/layout/generic/nsImageFrame.cpp @@ -305,7 +305,7 @@ nsImageFrame::Init(nsPresContext* aPresContext, // Give image loads associated with an image frame a small priority boost! nsCOMPtr p = do_QueryInterface(currentRequest); if (p) - p->BumpPriority(-1); + p->AdjustPriority(-1); } if (currentLoadStatus & imgIRequest::STATUS_ERROR) { diff --git a/mozilla/modules/libpr0n/src/imgLoader.cpp b/mozilla/modules/libpr0n/src/imgLoader.cpp index 8f234450002..6bba4277964 100644 --- a/mozilla/modules/libpr0n/src/imgLoader.cpp +++ b/mozilla/modules/libpr0n/src/imgLoader.cpp @@ -231,7 +231,7 @@ static nsresult NewImageChannel(nsIChannel **aResult, if (aLoadFlags & nsIRequest::LOAD_BACKGROUND) ++priority; // further reduce priority for background loads - p->BumpPriority(priority); + p->AdjustPriority(priority); } return NS_OK; diff --git a/mozilla/modules/libpr0n/src/imgRequest.cpp b/mozilla/modules/libpr0n/src/imgRequest.cpp index c28dff503d7..beb02b211a6 100644 --- a/mozilla/modules/libpr0n/src/imgRequest.cpp +++ b/mozilla/modules/libpr0n/src/imgRequest.cpp @@ -335,7 +335,7 @@ PRInt32 imgRequest::Priority() const return priority; } -void imgRequest::BumpPriority(imgRequestProxy *proxy, PRInt32 delta) +void imgRequest::AdjustPriority(imgRequestProxy *proxy, PRInt32 delta) { // only the first proxy is allowed to modify the priority of this image load. // @@ -349,7 +349,7 @@ void imgRequest::BumpPriority(imgRequestProxy *proxy, PRInt32 delta) nsCOMPtr p = do_QueryInterface(mChannel); if (p) - p->BumpPriority(delta); + p->AdjustPriority(delta); } /** imgILoad methods **/ diff --git a/mozilla/modules/libpr0n/src/imgRequest.h b/mozilla/modules/libpr0n/src/imgRequest.h index f319dcbdb84..d3a4640951c 100644 --- a/mozilla/modules/libpr0n/src/imgRequest.h +++ b/mozilla/modules/libpr0n/src/imgRequest.h @@ -121,9 +121,9 @@ private: // PRIORITY_NORMAL if it doesn't support nsISupportsPriority. PRInt32 Priority() const; - // Bump the priority of the underlying network request by the given delta + // Adjust the priority of the underlying network request by the given delta // on behalf of the given proxy. - void BumpPriority(imgRequestProxy *aProxy, PRInt32 aDelta); + void AdjustPriority(imgRequestProxy *aProxy, PRInt32 aDelta); public: NS_DECL_IMGILOAD diff --git a/mozilla/modules/libpr0n/src/imgRequestProxy.cpp b/mozilla/modules/libpr0n/src/imgRequestProxy.cpp index 25bc386c645..be95abb5d3c 100644 --- a/mozilla/modules/libpr0n/src/imgRequestProxy.cpp +++ b/mozilla/modules/libpr0n/src/imgRequestProxy.cpp @@ -366,14 +366,14 @@ NS_IMETHODIMP imgRequestProxy::GetPriority(PRInt32 *priority) NS_IMETHODIMP imgRequestProxy::SetPriority(PRInt32 priority) { NS_ENSURE_STATE(mOwner); - mOwner->BumpPriority(this, priority - mOwner->Priority()); + mOwner->AdjustPriority(this, priority - mOwner->Priority()); return NS_OK; } -NS_IMETHODIMP imgRequestProxy::BumpPriority(PRInt32 priority) +NS_IMETHODIMP imgRequestProxy::AdjustPriority(PRInt32 priority) { NS_ENSURE_STATE(mOwner); - mOwner->BumpPriority(this, priority); + mOwner->AdjustPriority(this, priority); return NS_OK; } diff --git a/mozilla/netwerk/base/src/nsLoadGroup.cpp b/mozilla/netwerk/base/src/nsLoadGroup.cpp index 976065d3992..096dae716c3 100644 --- a/mozilla/netwerk/base/src/nsLoadGroup.cpp +++ b/mozilla/netwerk/base/src/nsLoadGroup.cpp @@ -128,7 +128,7 @@ RescheduleRequest(nsIRequest *aRequest, PRInt32 delta) { nsCOMPtr p = do_QueryInterface(aRequest); if (p) - p->BumpPriority(delta); + p->AdjustPriority(delta); } PR_STATIC_CALLBACK(PLDHashOperator) @@ -837,11 +837,11 @@ nsLoadGroup::GetPriority(PRInt32 *aValue) NS_IMETHODIMP nsLoadGroup::SetPriority(PRInt32 aValue) { - return BumpPriority(aValue - mPriority); + return AdjustPriority(aValue - mPriority); } NS_IMETHODIMP -nsLoadGroup::BumpPriority(PRInt32 aDelta) +nsLoadGroup::AdjustPriority(PRInt32 aDelta) { // Update the priority for each request that supports nsISupportsPriority if (aDelta != 0) { diff --git a/mozilla/netwerk/protocol/http/src/nsHttpChannel.cpp b/mozilla/netwerk/protocol/http/src/nsHttpChannel.cpp index fdefd5b1c16..9ede1361906 100644 --- a/mozilla/netwerk/protocol/http/src/nsHttpChannel.cpp +++ b/mozilla/netwerk/protocol/http/src/nsHttpChannel.cpp @@ -3664,7 +3664,7 @@ nsHttpChannel::SetPriority(PRInt32 value) } NS_IMETHODIMP -nsHttpChannel::BumpPriority(PRInt32 delta) +nsHttpChannel::AdjustPriority(PRInt32 delta) { return SetPriority(mPriority + delta); } diff --git a/mozilla/uriloader/base/nsDocLoader.cpp b/mozilla/uriloader/base/nsDocLoader.cpp index 9f1f450ee1f..d6cd2779bb1 100644 --- a/mozilla/uriloader/base/nsDocLoader.cpp +++ b/mozilla/uriloader/base/nsDocLoader.cpp @@ -1509,14 +1509,14 @@ NS_IMETHODIMP nsDocLoader::SetPriority(PRInt32 aPriority) return NS_OK; } -NS_IMETHODIMP nsDocLoader::BumpPriority(PRInt32 aDelta) +NS_IMETHODIMP nsDocLoader::AdjustPriority(PRInt32 aDelta) { PR_LOG(gDocLoaderLog, PR_LOG_DEBUG, - ("DocLoader:%p: BumpPriority(%d) called\n", this, aDelta)); + ("DocLoader:%p: AdjustPriority(%d) called\n", this, aDelta)); nsCOMPtr p = do_QueryInterface(mLoadGroup); if (p) - p->BumpPriority(aDelta); + p->AdjustPriority(aDelta); PRInt32 count = mChildList.Count(); @@ -1524,7 +1524,7 @@ NS_IMETHODIMP nsDocLoader::BumpPriority(PRInt32 aDelta) for (PRInt32 i=0; i < count; i++) { loader = NS_STATIC_CAST(nsDocLoader*, ChildAt(i)); if (loader) { - loader->BumpPriority(aDelta); + loader->AdjustPriority(aDelta); } } diff --git a/mozilla/xpcom/threads/nsISupportsPriority.idl b/mozilla/xpcom/threads/nsISupportsPriority.idl index 4ce84ab92ba..c97d2dce52e 100644 --- a/mozilla/xpcom/threads/nsISupportsPriority.idl +++ b/mozilla/xpcom/threads/nsISupportsPriority.idl @@ -73,5 +73,5 @@ interface nsISupportsPriority : nsISupports * reduce the amount of coding required to increment or decrement the value * of the priority attribute. */ - void bumpPriority(in long delta); + void adjustPriority(in long delta); };