Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-12 12:55:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 843231 - Compute whether to use an XBL scope exactly once. r=bz

Browse Source
This commit is contained in:
Bobby Holley 2013-02-22 07:56:03 -08:00
parent d26a345b87
commit 9462fcb184
2 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
js/xpconnect/src/XPCWrappedNativeScope.cpp
View File

@ -128,6 +128,19 @@ XPCWrappedNativeScope::XPCWrappedNativeScope(JSContext *cx,
// Attach ourselves to the compartment private.
CompartmentPrivate *priv = EnsureCompartmentPrivate(aGlobal);
priv->scope = this;
// Determine whether to use an XBL scope or not.
mUseXBLScope = XPCJSRuntime::Get()->XBLScopesEnabled();
if (mUseXBLScope) {
js::Class *clasp = js::GetObjectClass(mGlobalJSObject);
mUseXBLScope = !strcmp(clasp->name, "Window") ||
!strcmp(clasp->name, "ChromeWindow") ||
!strcmp(clasp->name, "ModalContentWindow");
}
if (mUseXBLScope) {
nsIPrincipal *principal = GetPrincipal();
mUseXBLScope = principal && !nsContentUtils::IsSystemPrincipal(principal);
}
}
// static
@ -180,21 +193,8 @@ XPCWrappedNativeScope::EnsureXBLScope(JSContext *cx)
if (mXBLScope)
return mXBLScope;
// We should only be applying XBL bindings in DOM scopes.
MOZ_ASSERT(!strcmp(js::GetObjectClass(mGlobalJSObject)->name, "Window") ||
!strcmp(js::GetObjectClass(mGlobalJSObject)->name, "ChromeWindow") ||
!strcmp(js::GetObjectClass(mGlobalJSObject)->name, "ModalContentWindow"));
// Get the scope principal. If it's system, there's no reason to make
// a separate XBL scope.
nsIPrincipal *principal = GetPrincipal();
if (!principal)
return nullptr;
if (nsContentUtils::IsSystemPrincipal(principal))
return global;
// Check the pref. If XBL scopes are disabled, just return the global.
if (!XPCJSRuntime::Get()->XBLScopesEnabled())
// If this scope doesn't need an XBL scope, just return the global.
if (!mUseXBLScope)
return global;
// Set up the sandbox options. Note that we use the DOM global as the
@ -212,6 +212,7 @@ XPCWrappedNativeScope::EnsureXBLScope(JSContext *cx)
options.proto = global;
// Use an nsExpandedPrincipal to create asymmetric security.
nsIPrincipal *principal = GetPrincipal();
nsCOMPtr<nsIExpandedPrincipal> ep;
MOZ_ASSERT(!(ep = do_QueryInterface(principal)));
nsTArray< nsCOMPtr<nsIPrincipal> > principalAsArray(1);

1
js/xpconnect/src/xpcprivate.h
View File

@ -1760,6 +1760,7 @@ private:
JSBool mExperimentalBindingsEnabled;
bool mIsXBLScope;
bool mUseXBLScope;
};
/***************************************************************************/