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

Back out bug 935692 on this CLOSED TREE due to warnings-as-errors bustage.

Browse Source
This commit is contained in:
Kyle Huey 2013-12-09 10:46:18 -08:00
parent acc6abdaa6
commit 138e6cb7b0
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dom/workers/WorkerPrivate.cpp
View File

@ -1211,7 +1211,8 @@ public:
bool preventDefaultCalled; bool preventDefaultCalled;
nsIScriptGlobalObject* sgo; nsIScriptGlobalObject* sgo;
if (aWorkerPrivate) { if (aWorkerPrivate ||
!(sgo = nsJSUtils::GetStaticScriptGlobal(target))) {
WorkerGlobalScope* globalTarget = aWorkerPrivate->GlobalScope(); WorkerGlobalScope* globalTarget = aWorkerPrivate->GlobalScope();
MOZ_ASSERT(target == globalTarget->GetWrapperPreserveColor()); MOZ_ASSERT(target == globalTarget->GetWrapperPreserveColor());
@ -1232,7 +1233,7 @@ public:
preventDefaultCalled = status == nsEventStatus_eConsumeNoDefault; preventDefaultCalled = status == nsEventStatus_eConsumeNoDefault;
} }
else if (sgo = nsJSUtils::GetStaticScriptGlobal(target)) { else {
// Icky, we have to fire an InternalScriptErrorEvent... // Icky, we have to fire an InternalScriptErrorEvent...
InternalScriptErrorEvent event(true, NS_LOAD_ERROR); InternalScriptErrorEvent event(true, NS_LOAD_ERROR);
event.lineNr = aLineNumber; event.lineNr = aLineNumber;