Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-13 03:24:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 981218 - Stop using default compartment objects in nsJSUtils.cpp. r=bobowen

Browse Source
This commit is contained in:
Bobby Holley 2014-08-21 17:13:50 -07:00
parent 43e0dc6c0c
commit 3072f32a30
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dom/base/nsJSUtils.cpp
View File

@ -103,8 +103,7 @@ nsJSUtils::ReportPendingException(JSContext *aContext)
// otherwise default global) of aContext, so use that here.
nsIScriptContext* scx = GetScriptContextFromJSContext(aContext);
JS::Rooted<JSObject*> scope(aContext);
scope = scx ? scx->GetWindowProxy()
: js::DefaultObjectForContextOrNull(aContext);
scope = scx ? scx->GetWindowProxy() : nullptr;
if (!scope) {
// The SafeJSContext has no default object associated with it.
MOZ_ASSERT(NS_IsMainThread());
@ -319,8 +318,5 @@ JSObject* GetDefaultScopeFromJSContext(JSContext *cx)
// the cx, so in those cases we need to fetch it via the scx
// instead.
nsIScriptContext *scx = GetScriptContextFromJSContext(cx);
if (scx) {
return scx->GetWindowProxy();
}
return js::DefaultObjectForContextOrNull(cx);
return scx ? scx->GetWindowProxy() : nullptr;
}