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

Backed out 5 changesets (bug 1560178) for Browser-chrome failures in builds/worker/workspace/build/src/dom/base/Document.cpp. CLOSED TREE

Browse Source 
Backed out changeset 1ff8a41dd3c1 (bug 1560178)
Backed out changeset 4aaeda889656 (bug 1560178)
Backed out changeset b1dfc0b5a14c (bug 1560178)
Backed out changeset 45fca0f1b675 (bug 1560178)
Backed out changeset fc2be64e4ece (bug 1560178)
This commit is contained in:
Dorel Luca
2019-07-12 18:38:34 +03:00
parent 4736ac379d
commit a2abe7cb8f
32 changed files with 124 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
docshell/base/nsDocShell.cpp
View File

@@ -1564,8 +1564,8 @@ nsDocShell::SetRemoteSubframes(bool aUseRemoteSubframes) {
if (aUseRemoteSubframes && !annotated) {
annotated = true;
CrashReporter::AnnotateCrashReport(
CrashReporter::Annotation::DOMFissionEnabled, true);
CrashReporter::AnnotateCrashReport(CrashReporter::Annotation::DOMFissionEnabled,
true);
}
// Don't allow non-remote tabs with remote subframes.
@@ -9534,85 +9534,6 @@ nsresult nsDocShell::InternalLoad(nsDocShellLoadState* aLoadState,
}
}
// In e10s, in the parent process, we refuse to load anything other than
// "safe" resources that we ship or trust enough to give "special" URLs.
if (XRE_IsE10sParentProcess()) {
nsCOMPtr<nsIURI> uri = aLoadState->URI();
do {
bool canLoadInParent = false;
if (NS_SUCCEEDED(NS_URIChainHasFlags(
uri, nsIProtocolHandler::URI_IS_UI_RESOURCE, &canLoadInParent)) &&
canLoadInParent) {
// We allow UI resources.
break;
}
// For about: and extension-based URIs, which don't get
// URI_IS_UI_RESOURCE, first remove layers of view-source:, if present.
while (uri && uri->SchemeIs("view-source")) {
nsCOMPtr<nsINestedURI> nested = do_QueryInterface(uri);
if (nested) {
nested->GetInnerURI(getter_AddRefs(uri));
} else {
break;
}
}
// Allow about: URIs, and allow moz-extension ones if we're running
// extension content in the parent process.
if (!uri || uri->SchemeIs("about") ||
(!StaticPrefs::extensions_webextensions_remote() &&
uri->SchemeIs("moz-extension"))) {
break;
}
nsAutoCString scheme;
uri->GetScheme(scheme);
// Allow ext+foo URIs (extension-registered custom protocols). See
// https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/manifest.json/protocol_handlers
if (StringBeginsWith(scheme, NS_LITERAL_CSTRING("ext+")) &&
!StaticPrefs::extensions_webextensions_remote()) {
break;
}
// This next bit is... awful. Basically, about:addons used to load the
// discovery pane remotely. Allow for that, if that's actually the state
// we're in (which is no longer the default at time of writing, but still
// tested):
nsCOMPtr<nsIWebNavigation> parent(do_QueryInterface(mParent));
if (parent) {
nsCOMPtr<nsIURI> parentURL;
parent->GetCurrentURI(getter_AddRefs(parentURL));
if (parentURL &&
parentURL->GetSpecOrDefault().EqualsLiteral("about:addons") &&
(!Preferences::GetBool("extensions.htmlaboutaddons.enabled",
true) ||
!Preferences::GetBool(
"extensions.htmlaboutaddons.discover.enabled", true))) {
nsCString discoveryURLString;
Preferences::GetCString("extensions.webservice.discoverURL",
discoveryURLString);
nsCOMPtr<nsIURI> discoveryURL;
NS_NewURI(getter_AddRefs(discoveryURL), discoveryURLString);
nsAutoCString discoveryPrePath;
if (discoveryURL) {
discoveryURL->GetPrePath(discoveryPrePath);
}
nsAutoCString requestedPrePath;
uri->GetPrePath(requestedPrePath);
// So allow the discovery path to load inside about:addons.
if (discoveryPrePath.Equals(requestedPrePath)) {
break;
}
}
}
// Final exception for some legacy automated tests:
if (xpc::IsInAutomation() &&
Preferences::GetBool("security.allow_unsafe_parent_loads", false)) {
break;
}
return NS_ERROR_FAILURE;
} while (0);
}
// Whenever a top-level browsing context is navigated, the user agent MUST
// lock the orientation of the document to the document's default
// orientation. We don't explicitly check for a top-level browsing context