corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1558915 - Use infallible nsIURI::SchemeIs in dom/. r=smaug

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D40108
This commit is contained in:
Tom Schuster
2019-08-02 08:54:18 +00:00
parent 4aa70f1270
commit 1079fb412e
27 changed files with 53 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
dom/script/ScriptLoader.cpp
View File

@@ -358,9 +358,7 @@ bool ScriptLoader::IsAboutPageLoadingChromeURI(ScriptLoadRequest* aRequest) {
aRequest->TriggeringPrincipal()->GetURI(getter_AddRefs(triggeringURI));
NS_ENSURE_SUCCESS(rv, false);
bool isAbout =
(NS_SUCCEEDED(triggeringURI->SchemeIs("about", &isAbout)) && isAbout);
if (!isAbout) {
if (!triggeringURI->SchemeIs("about")) {
return false;
}
@@ -378,9 +376,7 @@ bool ScriptLoader::IsAboutPageLoadingChromeURI(ScriptLoadRequest* aRequest) {
}
// if the uri to be loaded is not of scheme chrome:, there is nothing to do.
bool isChrome =
(NS_SUCCEEDED(aRequest->mURI->SchemeIs("chrome", &isChrome)) && isChrome);
if (!isChrome) {
if (!aRequest->mURI->SchemeIs("chrome")) {
return false;
}
@@ -3529,22 +3525,8 @@ uint32_t ScriptLoader::NumberOfProcessors() {
}
static bool IsInternalURIScheme(nsIURI* uri) {
bool isWebExt;
if (NS_SUCCEEDED(uri->SchemeIs("moz-extension", &isWebExt)) && isWebExt) {
return true;
}
bool isResource;
if (NS_SUCCEEDED(uri->SchemeIs("resource", &isResource)) && isResource) {
return true;
}
bool isChrome;
if (NS_SUCCEEDED(uri->SchemeIs("chrome", &isChrome)) && isChrome) {
return true;
}
return false;
return uri->SchemeIs("moz-extension") || uri->SchemeIs("resource") ||
uri->SchemeIs("chrome");
}
nsresult ScriptLoader::PrepareLoadedRequest(ScriptLoadRequest* aRequest,