Bug 1290951 - P2.2: Make CompareManager::ComparisonFinished() public. r=bkelly

This commit is contained in:
Ho-Pang Hsu 2017-06-07 14:01:50 +08:00
parent 8f47260dec
commit 6a270821f2

View File

@ -324,6 +324,36 @@ public:
return mCacheStorage;
}
void
ComparisonFinished(nsresult aStatus, bool aIsEqual)
{
AssertIsOnMainThread();
if (mState == Finished) {
return;
}
MOZ_ASSERT(mState == WaitingForScriptOrComparisonResult);
if (NS_WARN_IF(NS_FAILED(aStatus))) {
Fail(aStatus);
return;
}
if (aIsEqual) {
MOZ_ASSERT(mCallback);
mCallback->ComparisonResult(aStatus,
aIsEqual,
EmptyString(),
mMaxScope,
mLoadFlags);
Cleanup();
return;
}
// Write to Cache so ScriptLoader reads succeed.
WriteNetworkBufferToNewCache();
}
private:
~CompareManager()
{
@ -489,36 +519,6 @@ private:
guard.release();
}
void
ComparisonFinished(nsresult aStatus, bool aIsEqual)
{
AssertIsOnMainThread();
if (mState == Finished) {
return;
}
MOZ_ASSERT(mState == WaitingForScriptOrComparisonResult);
if (NS_WARN_IF(NS_FAILED(aStatus))) {
Fail(aStatus);
return;
}
if (aIsEqual) {
MOZ_ASSERT(mCallback);
mCallback->ComparisonResult(aStatus,
aIsEqual,
EmptyString(),
mMaxScope,
mLoadFlags);
Cleanup();
return;
}
// Write to Cache so ScriptLoader reads succeed.
WriteNetworkBufferToNewCache();
}
void
WriteNetworkBufferToNewCache()
{