Bug 769273 - part1: Prep for refactoring NukeChromeCrossCompartmentWrappersForGlobal. r=bholley

dom/base/nsGlobalWindow.cpp

@@ -6860,7 +6860,8 @@ public:
       NS_ENSURE_TRUE(currentInner, NS_OK);
 
       JSObject* obj = currentInner->FastGetGlobalJSObject();
-      if (obj) {
+      // We only want to nuke wrappers for chrome->content case
+      if (obj && !js::IsSystemCompartment(js::GetObjectCompartment(obj))) {
         JSContext* cx =
           nsContentUtils::ThreadJSContextStack()->GetSafeJSContext();
 

js/src/jswrapper.cpp

@@ -1090,9 +1090,6 @@ js::NukeChromeCrossCompartmentWrappersForGlobal(JSContext *cx, JSObject *obj,
             JSObject *wobj = &e.front().value.get().toObject();
             JSObject *wrapped = UnwrapObject(wobj, false);
 
-            if (js::IsSystemCompartment(wrapped->compartment()))
-                continue; // Not interested in chrome->chrome wrappers.
-
             if (nukeGlobal == DontNukeForGlobalObject && wrapped == global)
                 continue;