Fix assertion and incorrect '!' that could cause us to create cross-origin wrappers in the wrong scope. bug 389796, r+sr=jst

dom/src/base/nsDOMClassInfo.cpp

@@ -5979,16 +5979,7 @@ nsWindowSH::NewResolve(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
 
     if (id == sWindow_id) {
       // window should *always* be the outer window object.
-      JSObject *scope;
+      nsGlobalWindow *oldWin = win;
-      nsGlobalWindow *innerWin;
-      if (win->IsInnerWindow()) {
-        scope = win->GetGlobalJSObject();
-      } else if (!(innerWin = win->GetCurrentInnerWindowInternal())) {
-        scope = innerWin->GetGlobalJSObject();
-      } else {
-        NS_ERROR("I don't know what scope to use!");
-        scope = win->GetGlobalJSObject();
-      }
       win = win->GetOuterWindowInternal();
       NS_ENSURE_TRUE(win, NS_ERROR_NOT_AVAILABLE);
 
@@ -6001,6 +5992,17 @@ nsWindowSH::NewResolve(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
       nsCOMPtr<nsIDOMChromeWindow> chrome =
         do_QueryInterface((nsIScriptGlobalObject *)win);
       if (!chrome) {
+        JSObject *scope;
+        nsGlobalWindow *innerWin;
+        if (oldWin->IsInnerWindow()) {
+          scope = oldWin->GetGlobalJSObject();
+        } else if ((innerWin = oldWin->GetCurrentInnerWindowInternal())) {
+          scope = innerWin->GetGlobalJSObject();
+        } else {
+          NS_ERROR("I don't know what scope to use!");
+          scope = oldWin->GetGlobalJSObject();
+        }
+
         rv = sXPConnect->GetCrossOriginWrapperForObject(cx,
                                                         scope,
                                                         JSVAL_TO_OBJECT(winVal),