wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 951847 - Don't construct an XPCCallContext just to find a JSContext. r=gabor

Browse Source
This commit is contained in:
Bobby Holley 2014-01-01 19:23:55 -08:00
parent 7bc456f9b0
commit 43c64baa57
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
js/xpconnect/src/XPCWrappedJSClass.cpp
View File

@ -473,28 +473,22 @@ nsXPCWrappedJSClass::IsWrappedJS(nsISupports* aPtr)
static JSContext *
GetContextFromObjectOrDefault(nsXPCWrappedJS* wrapper)
{
// Don't stomp over a running context.
// First, try the cx stack.
XPCJSContextStack* stack = XPCJSRuntime::Get()->GetJSContextStack();
if (stack && stack->Peek())
if (stack->Peek())
return stack->Peek();
// In order to get a context, we need a context.
XPCCallContext ccx(NATIVE_CALLER);
if (!ccx.IsValid())
return nullptr;
RootedObject obj(ccx, wrapper->GetJSObject());
JSAutoCompartment ac(ccx, obj);
XPCWrappedNativeScope* scope = GetObjectScope(obj);
XPCContext *xpcc = scope->GetContext();
// If the cx stack is empty, try the wrapper's JSObject.
JSCompartment *c = js::GetObjectCompartment(wrapper->GetJSObject());
XPCContext *xpcc = EnsureCompartmentPrivate(c)->scope->GetContext();
if (xpcc) {
JSContext *cx = xpcc->GetJSContext();
JS_AbortIfWrongThread(JS_GetRuntime(cx));
return cx;
}
return XPCCallContext::GetDefaultJSContext();
// Fall back to the safe JSContext.
return stack->GetSafeJSContext();
}
class SameOriginCheckedComponent MOZ_FINAL : public nsISecurityCheckedComponent