Backed out changeset 67652107c498 (bug 965309)

This commit is contained in:
Tim Taubert 2014-05-23 08:03:19 +02:00
parent 0cacd480c8
commit 77aebbb2bc

View File

@ -564,17 +564,6 @@ private:
MainThreadRun() MOZ_OVERRIDE MainThreadRun() MOZ_OVERRIDE
{ {
mProxy->Teardown(); mProxy->Teardown();
// Make sure to stop the syncLoop of a sync XHR request whose
// worker was released while the request was still running.
if (mProxy->mSyncLoopTarget) {
nsRefPtr<MainThreadStopSyncLoopRunnable> runnable =
new MainThreadStopSyncLoopRunnable(mWorkerPrivate,
mProxy->mSyncLoopTarget.forget(),
false);
MOZ_ALWAYS_TRUE(runnable->Dispatch(nullptr));
}
return NS_OK; return NS_OK;
} }
}; };
@ -1119,9 +1108,6 @@ LoadStartDetectionRunnable::Run()
mProxy->mWorkerPrivate = nullptr; mProxy->mWorkerPrivate = nullptr;
mProxy->mOutstandingSendCount--; mProxy->mOutstandingSendCount--;
} }
} else {
// The proxy was released and torn down by a SyncTeardownRunnable.
mProxy->mWorkerPrivate = nullptr;
} }
} }