Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-23 21:01:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1545523 - Set mRaceCacheWithNetwork to true if mCacheOpenFunc is assigned r=michal

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D33070

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Kershaw Chang 2019-06-10 13:37:04 +00:00
parent df1a302293
commit 84202aaa22
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
netwerk/protocol/http/nsHttpChannel.cpp
View File

@ -4101,9 +4101,6 @@ nsresult nsHttpChannel::OpenCacheEntryInternal(
mCacheOpenFunc = [openURI, extension, cacheEntryOpenFlags,
cacheStorage](nsHttpChannel* self) -> void {
MOZ_ASSERT(NS_IsMainThread(), "Should be called on the main thread");
if (self->mNetworkTriggered) {
self->mRaceCacheWithNetwork = true;
}
cacheStorage->AsyncOpenURI(openURI, extension, cacheEntryOpenFlags, self);
};
@ -9986,7 +9983,12 @@ nsresult nsHttpChannel::TriggerNetwork() {
return NS_OK;
}
if (AwaitingCacheCallbacks()) {
// If |mCacheOpenFunc| is assigned, we're delaying opening the entry to
// simulate racing. Although cache entry opening hasn't started yet, we're
// actually racing, so we must set mRaceCacheWithNetwork to true now.
if (mCacheOpenFunc) {
mRaceCacheWithNetwork = true;
} else if (AwaitingCacheCallbacks()) {
mRaceCacheWithNetwork = sRCWNEnabled;
}