r=ccarlen, sr=rpotts. 65925. making webprogress listeners support weak refs

xpfe/appshell/src/nsChromeTreeOwner.cpp

@@ -63,6 +63,7 @@ NS_INTERFACE_MAP_BEGIN(nsChromeTreeOwner)
    NS_INTERFACE_MAP_ENTRY(nsIBaseWindow)
    NS_INTERFACE_MAP_ENTRY(nsIWebProgressListener)
    NS_INTERFACE_MAP_ENTRY(nsIInterfaceRequestor)
+   NS_INTERFACE_MAP_ENTRY(nsISupportsWeakReference)
 NS_INTERFACE_MAP_END
 
 //*****************************************************************************

xpfe/appshell/src/nsChromeTreeOwner.h

@@ -31,13 +31,15 @@
 #include "nsIDocShellTreeOwner.h"
 #include "nsIInterfaceRequestor.h"
 #include "nsIWebProgressListener.h"
+#include "nsWeakReference.h"
 
 class nsXULWindow;
 
 class nsChromeTreeOwner : public nsIDocShellTreeOwner,
                           public nsIBaseWindow, 
                           public nsIInterfaceRequestor,
-                          public nsIWebProgressListener
+                          public nsIWebProgressListener,
+                          public nsSupportsWeakReference
 {
 friend class nsXULWindow;
 

xpfe/appshell/src/nsWebShellWindow.cpp

@@ -233,10 +233,10 @@ NS_INTERFACE_MAP_BEGIN(nsWebShellWindow)
    NS_INTERFACE_MAP_ENTRY(nsIWebShellWindow)
    NS_INTERFACE_MAP_ENTRY(nsIWebShellContainer)
    NS_INTERFACE_MAP_ENTRY(nsIWebProgressListener)
-   NS_INTERFACE_MAP_ENTRY(nsISupportsWeakReference)
    NS_INTERFACE_MAP_ENTRY(nsIXULWindow)
    NS_INTERFACE_MAP_ENTRY(nsIBaseWindow)
    NS_INTERFACE_MAP_ENTRY(nsIInterfaceRequestor)
+   NS_INTERFACE_MAP_ENTRY(nsISupportsWeakReference)
 NS_INTERFACE_MAP_END
 
 nsresult nsWebShellWindow::Initialize(nsIXULWindow* aParent,