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 952688 - Root CallbackObject's CallSetup around GlobalScope() call, r=terrence

Browse Source
This commit is contained in:
Steve Fink 2013-12-20 16:07:00 -08:00
parent d395467d2c
commit ea73add095
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dom/bindings/CallbackObject.cpp
View File

@ -69,6 +69,7 @@ CallbackObject::CallSetup::CallSetup(CallbackObject* aCallback,
JSObject* realCallback = js::UncheckedUnwrap(aCallback->CallbackPreserveColor());
JSContext* cx = nullptr;
nsIGlobalObject* globalObject = nullptr;
Maybe< JS::Rooted<JSObject*> > callbackRooter;
if (mIsMainThread) {
// Now get the global and JSContext for this callback.
@ -89,6 +90,7 @@ CallbackObject::CallSetup::CallSetup(CallbackObject* aCallback,
// This happens - Removing it causes
// test_bug293235.xul to go orange.
: nsContentUtils::GetSafeJSContext();
callbackRooter.construct(cx, realCallback);
globalObject = win;
} else {
// No DOM Window. Store the global and use the SafeJSContext.
@ -96,9 +98,11 @@ CallbackObject::CallSetup::CallSetup(CallbackObject* aCallback,
globalObject = xpc::GetNativeForGlobal(glob);
MOZ_ASSERT(globalObject);
cx = nsContentUtils::GetSafeJSContext();
callbackRooter.construct(cx, realCallback);
}
} else {
cx = workers::GetCurrentThreadJSContext();
callbackRooter.construct(cx, realCallback);
globalObject = workers::GetCurrentThreadWorkerPrivate()->GlobalScope();
}