Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-07 18:04:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset 437aa650b9d9 (bug 1290951)

Browse Source
This commit is contained in:
Carsten "Tomcat" Book 2017-04-19 11:54:57 +02:00
parent 73cd20cf99
commit 0a0f322bb7
1 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
dom/workers/ServiceWorkerScriptCache.cpp
View File

@ -351,29 +351,6 @@ public:
return NS_OK;
}
void
ComparisonFinished(nsresult aStatus, bool aIsEqual)
{
AssertIsOnMainThread();
MOZ_ASSERT(mCallback);
MOZ_ASSERT(mState == WaitingForScriptOrComparisonResult);
if (NS_WARN_IF(NS_FAILED(aStatus))) {
Fail(aStatus);
return;
}
if (aIsEqual) {
mCallback->ComparisonResult(aStatus, aIsEqual, EmptyString(), mMaxScope);
Cleanup();
return;
}
// Write to Cache so ScriptLoader reads succeed.
mState = WaitingForOpen;
WriteNetworkBufferToNewCache();
}
private:
~CompareManager()
{
@ -518,6 +495,29 @@ private:
return;
}
void
ComparisonFinished(nsresult aStatus, bool aIsEqual)
{
AssertIsOnMainThread();
MOZ_ASSERT(mCallback);
MOZ_ASSERT(mState == WaitingForScriptOrComparisonResult);
if (NS_WARN_IF(NS_FAILED(aStatus))) {
Fail(aStatus);
return;
}
if (aIsEqual) {
mCallback->ComparisonResult(aStatus, aIsEqual, EmptyString(), mMaxScope);
Cleanup();
return;
}
// Write to Cache so ScriptLoader reads succeed.
mState = WaitingForOpen;
WriteNetworkBufferToNewCache();
}
void
WriteNetworkBufferToNewCache()
{