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

- Bug 1175485 part 1 - Allow inner iterator of ReverseIterator deref to any type, and change IntegerIterator, EnumeratedRange, and nsFrameList::Iterator to return value type instead of a reference. r=roc,waldo (83c53e8e8)
- Bug 1175485 part 2 - Add static_assert to MakeRange to ensure it is used with integers. r=waldo (2b6fc759a)
- Bug 1175485 part 3 - Remove unused operators, typedefs and IteratorTraits. r=waldo (91bc5407d)
- Bug 1175485 part 4 - Add unit test for integer range. r=waldo (ec2b7d4c1)
- Bug 1188204 - Fix more constructors in MFBT; r=froydnj (099428523)
- Bug 1187985 - Make PersistentRooted use rootKind to find its lists; r=sfink (0c223593a)
- Bug 1184191 - Assert in release mode if we reenter the garbage collector r=terrence (3207d3631)
- Bug 1188124 - Use rootKind to select the right PersistentRooted list head; r=sfink (47009c787)
- Bug 1174849 - Remove "serviceworker" from RequestContext; r=smaug,bkelly (138e480ea)
- Bug 1174868 - Avoid storing RequestContext inside InternalRequest; r=nsm,bkelly,smaug (779a05075)
- Bug 1147668 - Correctly reflect video and track RequestContext values; r=smaug (90f265d5f)
- Bug 1148818 - Re-enable the Cache part of test_request_context.html on Android now that it passes (782fe9777)
- Bug 1148935 - Correctly reflect worker and sharedworker RequestContext values; r=smaug (fd40e01d8)

dom/workers/ScriptLoader.cpp

@@ -96,6 +96,7 @@ ChannelFromScriptURL(nsIPrincipal* principal,
                      const nsAString& aScriptURL,
                      bool aIsMainScript,
                      WorkerScriptType aWorkerScriptType,
+                     nsContentPolicyType aContentPolicyType,
                      nsIChannel** aChannel)
 {
   AssertIsOnMainThread();
@@ -112,7 +113,7 @@ ChannelFromScriptURL(nsIPrincipal* principal,
   // If we're part of a document then check the content load policy.
   if (parentDoc) {
     int16_t shouldLoad = nsIContentPolicy::ACCEPT;
-    rv = NS_CheckContentLoadPolicy(nsIContentPolicy::TYPE_SCRIPT, uri,
+    rv = NS_CheckContentLoadPolicy(aContentPolicyType, uri,
                                    principal, parentDoc,
                                    NS_LITERAL_CSTRING("text/javascript"),
                                    nullptr, &shouldLoad,
@@ -167,7 +168,7 @@ ChannelFromScriptURL(nsIPrincipal* principal,
                        uri,
                        parentDoc,
                        nsILoadInfo::SEC_NORMAL,
-                       nsIContentPolicy::TYPE_SCRIPT,
+                       aContentPolicyType,
                        loadGroup,
                        nullptr, // aCallbacks
                        flags,
@@ -182,7 +183,7 @@ ChannelFromScriptURL(nsIPrincipal* principal,
                        uri,
                        principal,
                        nsILoadInfo::SEC_NORMAL,
-                       nsIContentPolicy::TYPE_SCRIPT,
+                       aContentPolicyType,
                        loadGroup,
                        nullptr, // aCallbacks
                        flags,
@@ -830,7 +831,9 @@ private:
     if (!channel) {
       rv = ChannelFromScriptURL(principal, baseURI, parentDoc, loadGroup, ios,
                                 secMan, loadInfo.mURL, IsMainWorkerScript(),
-                                mWorkerScriptType, getter_AddRefs(channel));
+                                mWorkerScriptType,
+                                mWorkerPrivate->ContentPolicyType(),
+                                getter_AddRefs(channel));
       if (NS_WARN_IF(NS_FAILED(rv))) {
         return rv;
       }
@@ -1572,6 +1575,8 @@ public:
       scriptloader::ChannelFromScriptURLMainThread(principal, baseURI,
                                                    parentDoc, loadGroup,
                                                    mScriptURL,
+                                                   // Nested workers are always dedicated.
+                                                   nsIContentPolicy::TYPE_INTERNAL_WORKER,
                                                    getter_AddRefs(channel));
     if (NS_SUCCEEDED(mResult)) {
       channel.forget(mChannel);
@@ -1786,6 +1791,7 @@ ChannelFromScriptURLMainThread(nsIPrincipal* aPrincipal,
                                nsIDocument* aParentDoc,
                                nsILoadGroup* aLoadGroup,
                                const nsAString& aScriptURL,
+                               nsContentPolicyType aContentPolicyType,
                                nsIChannel** aChannel)
 {
   AssertIsOnMainThread();
@@ -1796,7 +1802,8 @@ ChannelFromScriptURLMainThread(nsIPrincipal* aPrincipal,
   NS_ASSERTION(secMan, "This should never be null!");
 
   return ChannelFromScriptURL(aPrincipal, aBaseURI, aParentDoc, aLoadGroup,
-                              ios, secMan, aScriptURL, true, WorkerScript, aChannel);
+                              ios, secMan, aScriptURL, true, WorkerScript,
+                              aContentPolicyType, aChannel);
 }
 
 nsresult