import changes from `dev' branch of rmottola/Arctic-Fox:

- Bug 1204426 - Unregister message listeners of settings service locks. r=khuey (751d0c649)
- Bug 1173930 - Not invoke FullscreenChange callback on OS X if state is not changed. r=smichaud (70f406f3c)
- Bug 1171061 - use std::bitset for deprecation and document warnings in nsDocument; r=smaug (02ec9b4c3)
- Bug 1157619 P1 Network requests should not be intercepted when force-refreshed. r=smaug (9a33463d2)
- Bug 1165501 - using most recent referrer policy found in the document. r=sstamm (74c7eef63)

docshell/base/nsDocShell.cpp

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