Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 05:41:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 609752 - Remove mChannel from nsProgressNotificationProxy. r=dougt,jduell a=blocking-fennec

Browse Source
This commit is contained in:
Alon Zakai 2010-11-21 11:21:57 -08:00
parent b1c1b17c3d
commit 8c2350d5af
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
modules/libpr0n/src/imgLoader.cpp
View File

@ -270,7 +270,7 @@ class nsProgressNotificationProxy : public nsIProgressEventSink
public:
nsProgressNotificationProxy(nsIChannel* channel,
imgIRequest* proxy)
: mChannel(channel), mImageRequest(proxy) {
: mImageRequest(proxy) {
channel->GetNotificationCallbacks(getter_AddRefs(mOriginalCallbacks));
}
@ -281,7 +281,6 @@ class nsProgressNotificationProxy : public nsIProgressEventSink
private:
~nsProgressNotificationProxy() {}
nsCOMPtr<nsIChannel> mChannel;
nsCOMPtr<nsIInterfaceRequestor> mOriginalCallbacks;
nsCOMPtr<nsIRequest> mImageRequest;
};
@ -297,7 +296,7 @@ nsProgressNotificationProxy::OnProgress(nsIRequest* request,
PRUint64 progress,
PRUint64 progressMax) {
nsCOMPtr<nsILoadGroup> loadGroup;
mChannel->GetLoadGroup(getter_AddRefs(loadGroup));
request->GetLoadGroup(getter_AddRefs(loadGroup));
nsCOMPtr<nsIProgressEventSink> target;
NS_QueryNotificationCallbacks(mOriginalCallbacks,
@ -315,7 +314,7 @@ nsProgressNotificationProxy::OnStatus(nsIRequest* request,
nsresult status,
const PRUnichar* statusArg) {
nsCOMPtr<nsILoadGroup> loadGroup;
mChannel->GetLoadGroup(getter_AddRefs(loadGroup));
request->GetLoadGroup(getter_AddRefs(loadGroup));
nsCOMPtr<nsIProgressEventSink> target;
NS_QueryNotificationCallbacks(mOriginalCallbacks,
@ -332,16 +331,9 @@ nsProgressNotificationProxy::AsyncOnChannelRedirect(nsIChannel *oldChannel,
nsIChannel *newChannel,
PRUint32 flags,
nsIAsyncVerifyRedirectCallback *cb) {
// The 'old' channel should match the current one
NS_ABORT_IF_FALSE(oldChannel == mChannel,
"old channel doesn't match current!");
// Save the new channel
mChannel = newChannel;
// Tell the original original callbacks about it too
nsCOMPtr<nsILoadGroup> loadGroup;
mChannel->GetLoadGroup(getter_AddRefs(loadGroup));
newChannel->GetLoadGroup(getter_AddRefs(loadGroup));
nsCOMPtr<nsIChannelEventSink> target;
NS_QueryNotificationCallbacks(mOriginalCallbacks,
loadGroup,