Bug 402982, fixing bustage

git-svn-id: svn://10.0.0.236/trunk@246535 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/content/base/src/nsFrameLoader.cpp

@@ -89,6 +89,7 @@ public:
     if (base_win) {
       base_win->Destroy();
     }
+    return NS_OK;
   }
   nsRefPtr<nsIDocShell> mDocShell;
 };

mozilla/content/base/src/nsFrameLoader.h

@@ -62,16 +62,17 @@ public:
     mInDestructor(PR_FALSE)
   {}
 
+  ~nsFrameLoader() {
+    mInDestructor = PR_TRUE;
+    nsFrameLoader::Destroy();
+  }
+
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_CYCLE_COLLECTION_CLASS(nsFrameLoader)
   NS_DECL_NSIFRAMELOADER
   NS_HIDDEN_(nsresult) CheckForRecursiveLoad(nsIURI* aURI);
   void Finalize();
 private:
-  ~nsFrameLoader() {
-    mInDestructor = PR_TRUE;
-    nsFrameLoader::Destroy();
-  }
 
   NS_HIDDEN_(nsresult) EnsureDocShell();
   NS_HIDDEN_(void) GetURL(nsString& aURL);