Bug 1017424 part 9. Remove redundant xpconnect code looking for ChromeWindow/ModalContentWindow classes. r=bholley
authorBoris Zbarsky <bzbarsky@mit.edu>
Fri, 05 Sep 2014 14:28:46 -0400
changeset 203964 da53d970e60627b984d8aff9f090bd5c4715933d
parent 203963 cc33b791aaefdb5e924bfa78adbc422848dbadad
child 203965 bda5f3a0f8a2e15b59d57be402192583b7936663
push id27446
push usercbook@mozilla.com
push dateMon, 08 Sep 2014 13:22:40 +0000
treeherdermozilla-central@dd3961697eb5 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbholley
bugs1017424
milestone35.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1017424 part 9. Remove redundant xpconnect code looking for ChromeWindow/ModalContentWindow classes. r=bholley
js/xpconnect/src/XPCWrappedNativeScope.cpp
--- a/js/xpconnect/src/XPCWrappedNativeScope.cpp
+++ b/js/xpconnect/src/XPCWrappedNativeScope.cpp
@@ -115,19 +115,17 @@ XPCWrappedNativeScope::XPCWrappedNativeS
     // remote XUL domains, _except_ if we have an additional pref override set.
     nsIPrincipal *principal = GetPrincipal();
     mAllowContentXBLScope = !RemoteXULForbidsXBLScope(principal, aGlobal);
 
     // Determine whether to use an XBL scope.
     mUseContentXBLScope = mAllowContentXBLScope;
     if (mUseContentXBLScope) {
       const js::Class *clasp = js::GetObjectClass(mGlobalJSObject);
-      mUseContentXBLScope = !strcmp(clasp->name, "Window") ||
-                            !strcmp(clasp->name, "ChromeWindow") ||
-                            !strcmp(clasp->name, "ModalContentWindow");
+      mUseContentXBLScope = !strcmp(clasp->name, "Window");
     }
     if (mUseContentXBLScope) {
       mUseContentXBLScope = principal && !nsContentUtils::IsSystemPrincipal(principal);
     }
 
     JSAddonId *addonId = JS::AddonIdOfObject(aGlobal);
     if (gInterpositionMap) {
         if (InterpositionMap::Ptr p = gInterpositionMap->lookup(addonId)) {