wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1210941 P4 Use LOAD_BYPASS_SERVICE_WORKER instead of ForceNoIntercept in nsDocShell. r=ehsan

Browse Source
This commit is contained in:
Ben Kelly 2015-10-06 06:37:07 -07:00
parent 568567e9f3
commit 6f5ac6af87
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
docshell/base/nsDocShell.cpp
View File

@ -10897,17 +10897,14 @@ nsDocShell::DoChannelLoad(nsIChannel* aChannel,
loadFlags |= nsIChannel::LOAD_CLASSIFY_URI; loadFlags |= nsIChannel::LOAD_CLASSIFY_URI;
} }
(void)aChannel->SetLoadFlags(loadFlags);
// If the user pressed shift-reload, then do not allow ServiceWorker // If the user pressed shift-reload, then do not allow ServiceWorker
// interception to occur. See step 12.1 of the SW HandleFetch algorithm. // interception to occur. See step 12.1 of the SW HandleFetch algorithm.
if (IsForceReloadType(mLoadType)) { if (IsForceReloadType(mLoadType)) {
nsCOMPtr<nsIHttpChannelInternal> internal = do_QueryInterface(aChannel); loadFlags |= nsIChannel::LOAD_BYPASS_SERVICE_WORKER;
if (internal) {
internal->ForceNoIntercept();
}
} }
(void)aChannel->SetLoadFlags(loadFlags);
uint32_t openFlags = 0; uint32_t openFlags = 0;
if (mLoadType == LOAD_LINK) { if (mLoadType == LOAD_LINK) {
openFlags |= nsIURILoader::IS_CONTENT_PREFERRED; openFlags |= nsIURILoader::IS_CONTENT_PREFERRED;