Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 11:25:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset 469e97e6f44d (bug 1757657) for causing failures related to nsAboutRedirector.cpp CLOSED TREE

Browse Source
This commit is contained in:
Noemi Erli 2022-03-19 19:16:41 +02:00
parent c7570b5a64
commit 12e24d553d
4 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
browser/components/sessionstore/SessionStore.jsm
View File

@ -5466,6 +5466,7 @@ var SessionStoreInternal = {
aTabState.entries.length == 1 &&
(aTabState.entries[0].url == "about:blank" ||
aTabState.entries[0].url == "about:newtab" ||
aTabState.entries[0].url == "about:printpreview" ||
aTabState.entries[0].url == "about:privatebrowsing") &&
!aTabState.userTypedValue
)
@ -5490,7 +5491,10 @@ var SessionStoreInternal = {
aTabState.userTypedValue ||
(aTabState.attributes && aTabState.attributes.customizemode == "true") ||
(aTabState.entries.length &&
aTabState.entries[0].url != "about:privatebrowsing")
!(
aTabState.entries[0].url == "about:printpreview" ||
aTabState.entries[0].url == "about:privatebrowsing"
))
);
},

4
docshell/base/nsAboutRedirector.cpp
View File

@ -159,6 +159,10 @@ static const RedirEntry kRedirMap[] = {
nsIAboutModule::ALLOW_SCRIPT},
{"webrtc", "chrome://global/content/aboutwebrtc/aboutWebrtc.html",
nsIAboutModule::ALLOW_SCRIPT},
{"printpreview", "about:blank",
nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
nsIAboutModule::HIDE_FROM_ABOUTABOUT |
nsIAboutModule::URI_CAN_LOAD_IN_CHILD},
{"crashparent", "about:blank", nsIAboutModule::HIDE_FROM_ABOUTABOUT},
{"crashcontent", "about:blank",
nsIAboutModule::HIDE_FROM_ABOUTABOUT |

2
dom/security/nsContentSecurityUtils.cpp
View File

@ -1127,6 +1127,8 @@ void nsContentSecurityUtils::AssertAboutPageHasCSP(Document* aDocument) {
"about:srcdoc"_ns,
// about:sync-log displays plain text only -> no CSP
"about:sync-log"_ns,
// about:printpreview displays plain text only -> no CSP
"about:printpreview"_ns,
// about:logo just displays the firefox logo -> no CSP
"about:logo"_ns,
// about:sync is a special mozilla-signed developer addon with low usage ->

3
netwerk/ipc/DocumentChannel.cpp
View File

@ -159,7 +159,8 @@ static bool URIUsesDocChannel(nsIURI* aURI) {
}
nsCString spec = aURI->GetSpecOrDefault();
return !spec.EqualsLiteral("about:crashcontent");
return !spec.EqualsLiteral("about:printpreview") &&
!spec.EqualsLiteral("about:crashcontent");
}
bool DocumentChannel::CanUseDocumentChannel(nsIURI* aURI) {