зеркало из https://github.com/mozilla/gecko-dev.git
Followup for bug 1246091 to fix the rooting hazard, get us closer to reopening the CLOSED TREE, and reduce philor's blood pressure.
This commit is contained in:
Родитель
7192c2be5a
Коммит
12e6e3f600
|
@ -1495,6 +1495,8 @@ Console::PopulateConsoleObjectInTheTargetScope(JSContext* aCx,
|
||||||
MOZ_ASSERT(aData);
|
MOZ_ASSERT(aData);
|
||||||
MOZ_ASSERT(aTargetScope);
|
MOZ_ASSERT(aTargetScope);
|
||||||
|
|
||||||
|
JS::Rooted<JSObject*> targetScope(aCx, aTargetScope);
|
||||||
|
|
||||||
ConsoleStackEntry frame;
|
ConsoleStackEntry frame;
|
||||||
if (aData->mTopStackFrame) {
|
if (aData->mTopStackFrame) {
|
||||||
frame = *aData->mTopStackFrame;
|
frame = *aData->mTopStackFrame;
|
||||||
|
@ -1590,7 +1592,7 @@ Console::PopulateConsoleObjectInTheTargetScope(JSContext* aCx,
|
||||||
aData->mCountValue);
|
aData->mCountValue);
|
||||||
}
|
}
|
||||||
|
|
||||||
JSAutoCompartment ac2(aCx, aTargetScope);
|
JSAutoCompartment ac2(aCx, targetScope);
|
||||||
|
|
||||||
if (NS_WARN_IF(!ToJSValue(aCx, event, aEventValue))) {
|
if (NS_WARN_IF(!ToJSValue(aCx, event, aEventValue))) {
|
||||||
return false;
|
return false;
|
||||||
|
|
Загрузка…
Ссылка в новой задаче