GlobalWindowImpl::SetNewDocument: fixed multiple initialization of JSContext. Always clears the scope first.

dom/src/base/nsGlobalWindow.cpp

@@ -213,20 +213,19 @@ GlobalWindowImpl::SetContext(nsIScriptContext *aContext)
 NS_IMETHODIMP_(void)       
 GlobalWindowImpl::SetNewDocument(nsIDOMDocument *aDocument)
 {
-  if (nsnull != mDocument) {
+  ClearAllTimeouts();
-    ClearAllTimeouts();
 
-    if (nsnull != mScriptObject && nsnull != mContext) {
+  if (nsnull != mScriptObject && nsnull != mContext) {
-      JS_ClearScope((JSContext *)mContext->GetNativeContext(),
+    JS_ClearScope((JSContext *)mContext->GetNativeContext(),
-                    (JSObject *)mScriptObject);
+                  (JSObject *)mScriptObject);
-    }
-    
-    NS_RELEASE(mDocument);
-    if (nsnull != mContext) {
-      mContext->GC();
-    }
   }
     
+  if (nsnull != mDocument)
+    NS_RELEASE(mDocument);
+    
+  if (nsnull != mContext)
+    mContext->GC();
+
   mDocument = aDocument;
   
   if (nsnull != mDocument) {