зеркало из https://github.com/mozilla/gecko-dev.git
Bug 572520: step 3, remove unused parameters on imgRequestProxy::on*. r=jrmuizel,bholley
This commit is contained in:
Родитель
7b8cd77a78
Коммит
251ae15b83
|
@ -302,7 +302,7 @@ nsresult imgRequest::RemoveProxy(imgRequestProxy *proxy, nsresult aStatus, PRBoo
|
||||||
|
|
||||||
// make sure that observer gets an OnStopRequest message sent to it
|
// make sure that observer gets an OnStopRequest message sent to it
|
||||||
if (!(mState & stateRequestStopped)) {
|
if (!(mState & stateRequestStopped)) {
|
||||||
proxy->OnStopRequest(nsnull, nsnull, NS_BINDING_ABORTED, PR_TRUE);
|
proxy->OnStopRequest(PR_TRUE);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (mImage && !HaveProxyWithObserver(nsnull)) {
|
if (mImage && !HaveProxyWithObserver(nsnull)) {
|
||||||
|
@ -361,7 +361,7 @@ nsresult imgRequest::NotifyProxyListener(imgRequestProxy *proxy)
|
||||||
|
|
||||||
// OnStartRequest
|
// OnStartRequest
|
||||||
if (mState & stateRequestStarted)
|
if (mState & stateRequestStarted)
|
||||||
proxy->OnStartRequest(nsnull, nsnull);
|
proxy->OnStartRequest();
|
||||||
|
|
||||||
// OnStartContainer
|
// OnStartContainer
|
||||||
if (mState & stateHasSize)
|
if (mState & stateHasSize)
|
||||||
|
@ -404,9 +404,7 @@ nsresult imgRequest::NotifyProxyListener(imgRequestProxy *proxy)
|
||||||
|
|
||||||
if (mState & stateRequestStopped) {
|
if (mState & stateRequestStopped) {
|
||||||
proxy->OnStopDecode(GetResultFromImageStatus(mImageStatus), nsnull);
|
proxy->OnStopDecode(GetResultFromImageStatus(mImageStatus), nsnull);
|
||||||
proxy->OnStopRequest(nsnull, nsnull,
|
proxy->OnStopRequest(mHadLastPart);
|
||||||
GetResultFromImageStatus(mImageStatus),
|
|
||||||
mHadLastPart);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return NS_OK;
|
return NS_OK;
|
||||||
|
@ -895,7 +893,7 @@ NS_IMETHODIMP imgRequest::OnStartRequest(nsIRequest *aRequest, nsISupports *ctxt
|
||||||
/* notify our kids */
|
/* notify our kids */
|
||||||
nsTObserverArray<imgRequestProxy*>::ForwardIterator iter(mObservers);
|
nsTObserverArray<imgRequestProxy*>::ForwardIterator iter(mObservers);
|
||||||
while (iter.HasMore()) {
|
while (iter.HasMore()) {
|
||||||
iter.GetNext()->OnStartRequest(aRequest, ctxt);
|
iter.GetNext()->OnStartRequest();
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Get our principal */
|
/* Get our principal */
|
||||||
|
@ -1043,7 +1041,7 @@ NS_IMETHODIMP imgRequest::OnStopRequest(nsIRequest *aRequest, nsISupports *ctxt,
|
||||||
|
|
||||||
nsTObserverArray<imgRequestProxy*>::ForwardIterator srIter(mObservers);
|
nsTObserverArray<imgRequestProxy*>::ForwardIterator srIter(mObservers);
|
||||||
while (srIter.HasMore()) {
|
while (srIter.HasMore()) {
|
||||||
srIter.GetNext()->OnStopRequest(aRequest, ctxt, status, mHadLastPart);
|
srIter.GetNext()->OnStopRequest(mHadLastPart);
|
||||||
}
|
}
|
||||||
|
|
||||||
return NS_OK;
|
return NS_OK;
|
||||||
|
|
|
@ -613,7 +613,7 @@ void imgRequestProxy::OnDiscard()
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
void imgRequestProxy::OnStartRequest(nsIRequest *request, nsISupports *ctxt)
|
void imgRequestProxy::OnStartRequest()
|
||||||
{
|
{
|
||||||
#ifdef PR_LOGGING
|
#ifdef PR_LOGGING
|
||||||
nsCAutoString name;
|
nsCAutoString name;
|
||||||
|
@ -630,8 +630,7 @@ void imgRequestProxy::OnStartRequest(nsIRequest *request, nsISupports *ctxt)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void imgRequestProxy::OnStopRequest(nsIRequest *request, nsISupports *ctxt,
|
void imgRequestProxy::OnStopRequest(PRBool lastPart)
|
||||||
nsresult statusCode, PRBool lastPart)
|
|
||||||
{
|
{
|
||||||
#ifdef PR_LOGGING
|
#ifdef PR_LOGGING
|
||||||
nsCAutoString name;
|
nsCAutoString name;
|
||||||
|
|
|
@ -121,9 +121,9 @@ protected:
|
||||||
/* non-virtual imgIContainerObserver methods */
|
/* non-virtual imgIContainerObserver methods */
|
||||||
void FrameChanged(imgIContainer *aContainer, nsIntRect * aDirtyRect);
|
void FrameChanged(imgIContainer *aContainer, nsIntRect * aDirtyRect);
|
||||||
|
|
||||||
/* non-virtual nsIRequestObserver (plus some) methods */
|
/* non-virtual sort-of-nsIRequestObserver methods */
|
||||||
void OnStartRequest(nsIRequest *request, nsISupports *ctxt);
|
void OnStartRequest();
|
||||||
void OnStopRequest(nsIRequest *request, nsISupports *ctxt, nsresult statusCode, PRBool aLastPart);
|
void OnStopRequest(PRBool aLastPart);
|
||||||
|
|
||||||
inline PRBool HasObserver() const {
|
inline PRBool HasObserver() const {
|
||||||
return mListener != nsnull;
|
return mListener != nsnull;
|
||||||
|
|
Загрузка…
Ссылка в новой задаче