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)
This commit is contained in:
2021-04-30 09:42:27 +08:00
parent 6964ded9a6
commit 202b273a2e
46 changed files with 472 additions and 317 deletions
+2 -2
View File
@@ -234,7 +234,7 @@ nsScriptLoader::CheckContentPolicy(nsIDocument* aDocument,
const nsAString &aType)
{
int16_t shouldLoad = nsIContentPolicy::ACCEPT;
nsresult rv = NS_CheckContentLoadPolicy(nsIContentPolicy::TYPE_SCRIPT,
nsresult rv = NS_CheckContentLoadPolicy(nsIContentPolicy::TYPE_INTERNAL_SCRIPT,
aURI,
aDocument->NodePrincipal(),
aContext,
@@ -309,7 +309,7 @@ nsScriptLoader::StartLoad(nsScriptLoadRequest *aRequest, const nsAString &aType,
aRequest->mURI,
mDocument,
nsILoadInfo::SEC_NORMAL,
nsIContentPolicy::TYPE_SCRIPT,
nsIContentPolicy::TYPE_INTERNAL_SCRIPT,
loadGroup,
prompter,
nsIRequest::LOAD_NORMAL |