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

This commit is contained in:
Kyle Huey 2013-12-09 10:46:18 -08:00
parent acc6abdaa6
commit 138e6cb7b0

View File

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