Bug 265289 - GetListenerInfo comparing weakrefs rather than referents. r=bsmedberg, sr=darin

uriloader/base/nsDocLoader.cpp

@@ -852,17 +852,18 @@ nsDocLoaderImpl::AddProgressListener(nsIWebProgressListener *aListener,
                                      PRUint32 aNotifyMask)
 {
   nsresult rv;
-  nsWeakPtr listener = do_GetWeakReference(aListener);
-  if (!listener) {
-    return NS_ERROR_INVALID_ARG;
-  }
 
-  nsListenerInfo* info = GetListenerInfo(listener);
+  nsListenerInfo* info = GetListenerInfo(aListener);
   if (info) {
     // The listener is already registered!
     return NS_ERROR_FAILURE;
   }
 
+  nsWeakPtr listener = do_GetWeakReference(aListener);
+  if (!listener) {
+    return NS_ERROR_INVALID_ARG;
+  }
+
   info = new nsListenerInfo(listener, aNotifyMask);
   if (!info) {
     return NS_ERROR_OUT_OF_MEMORY;
@@ -876,12 +877,8 @@ NS_IMETHODIMP
 nsDocLoaderImpl::RemoveProgressListener(nsIWebProgressListener *aListener)
 {
   nsresult rv;
-  nsWeakPtr listener = do_GetWeakReference(aListener);
-  if (!listener) {
-    return NS_ERROR_INVALID_ARG;
-  }
 
-  nsListenerInfo* info = GetListenerInfo(listener);
+  nsListenerInfo* info = GetListenerInfo(aListener);
   if (info) {
     rv = mListenerInfoList.RemoveElement(info) ? NS_OK : NS_ERROR_FAILURE;
     delete info;
@@ -1322,17 +1319,20 @@ nsDocLoaderImpl::FireOnStatusChange(nsIWebProgress* aWebProgress,
 }
 
 nsListenerInfo * 
-nsDocLoaderImpl::GetListenerInfo(nsIWeakReference *aListener)
+nsDocLoaderImpl::GetListenerInfo(nsIWebProgressListener *aListener)
 {
   PRInt32 i, count;
   nsListenerInfo *info;
 
+  nsCOMPtr<nsISupports> listener1 = do_QueryInterface(aListener);
   count = mListenerInfoList.Count();
   for (i=0; i<count; i++) {
     info = NS_STATIC_CAST(nsListenerInfo* ,mListenerInfoList.SafeElementAt(i));
 
     NS_ASSERTION(info, "There should NEVER be a null listener in the list");
-    if (info && (aListener == info->mWeakListener)) {
+    if (info) {
+      nsCOMPtr<nsISupports> listener2 = do_QueryReferent(info->mWeakListener);
+      if (listener1 == listener2)
         return info;
     }
   }

uriloader/base/nsDocLoader.h

@@ -175,7 +175,7 @@ protected:
     PLDHashTable mRequestInfoHash;
 
 private:
-    nsListenerInfo *GetListenerInfo(nsIWeakReference* aListener);
+    nsListenerInfo *GetListenerInfo(nsIWebProgressListener* aListener);
 
     PRInt32 GetMaxTotalProgress();