mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Backed out changeset 6fa00ccfe7e0 (bug 1816287) for causing bustages on LocationBase.cpp CLOSED TREE

This commit is contained in:
Norisz Fay 2023-05-17 20:11:39 +03:00
Родитель 052ecb6fd8
Коммит 34b6c94a76
12 изменённых файлов: 31 добавлений и 195 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

11
docshell/base/nsDocShell.cpp
Просмотреть файл

@ -10186,7 +10186,11 @@ nsresult nsDocShell::DoURILoad(nsDocShellLoadState* aLoadState,
if (StaticPrefs::dom_block_external_protocol_in_iframes()) {
// Only allow URLs able to return data in iframes.
if (nsContentUtils::IsExternalProtocol(aLoadState->URI())) {
bool doesNotReturnData = false;
NS_URIChainHasFlags(aLoadState->URI(),
nsIProtocolHandler::URI_DOES_NOT_RETURN_DATA,
&doesNotReturnData);
if (doesNotReturnData) {
// The context to check user-interaction with for the purposes of
// popup-blocking.
//
@ -12847,11 +12851,6 @@ nsresult nsDocShell::OnLinkClick(
return NS_OK;
}
Document* ownerDoc = aContent->OwnerDoc();
if (nsContentUtils::IsExternalProtocol(aURI)) {
ownerDoc->EnsureNotEnteringAndExitFullscreen();
}
bool noOpenerImplied = false;
nsAutoString target(aTargetSpec);
if (aFileName.IsVoid() &&

7
dom/base/Document.cpp
Просмотреть файл

@ -3959,13 +3959,6 @@ nsresult Document::InitFeaturePolicy(nsIChannel* aChannel) {
return NS_OK;
}
void Document::EnsureNotEnteringAndExitFullscreen() {
Document::ClearPendingFullscreenRequests(this);
if (GetFullscreenElement()) {
Document::AsyncExitFullscreen(this);
}
}
void Document::SetReferrerInfo(nsIReferrerInfo* aReferrerInfo) {
mReferrerInfo = aReferrerInfo;
mCachedReferrerInfoForInternalCSSAndSVGResources = nullptr;

2
dom/base/Document.h
Просмотреть файл

@ -1549,8 +1549,6 @@ class Document : public nsINode,
void InitFeaturePolicy();
nsresult InitFeaturePolicy(nsIChannel* aChannel);
void EnsureNotEnteringAndExitFullscreen();
protected:
friend class nsUnblockOnloadEvent;

5
dom/base/LocationBase.cpp
Просмотреть файл

@ -175,11 +175,6 @@ void LocationBase::SetURI(nsIURI* aURI, nsIPrincipal& aSubjectPrincipal,
}
aRv.Throw(rv);
}
Document* doc = bc->GetDocument();
if (doc && nsContentUtils::IsExternalProtocol(aURI)) {
doc->EnsureNotEnteringAndExitFullscreen();
}
}
void LocationBase::SetHref(const nsAString& aHref,

7
dom/base/nsContentUtils.cpp
Просмотреть файл

@ -957,13 +957,6 @@ mozilla::EventClassID nsContentUtils::GetEventClassIDFromMessage(
}
}
bool nsContentUtils::IsExternalProtocol(nsIURI* aURI) {
bool doesNotReturnData = false;
nsresult rv = NS_URIChainHasFlags(
aURI, nsIProtocolHandler::URI_DOES_NOT_RETURN_DATA, &doesNotReturnData);
return NS_SUCCEEDED(rv) && doesNotReturnData;
}
static nsAtom* GetEventTypeFromMessage(EventMessage aEventMessage) {
switch (aEventMessage) {
#define MESSAGE_TO_EVENT(name_, message_, type_, struct_) \

2
dom/base/nsContentUtils.h
Просмотреть файл

@ -3405,8 +3405,6 @@ class nsContentUtils {
*/
static nsIContent* GetClosestLinkInFlatTree(nsIContent* aContent);
static bool IsExternalProtocol(nsIURI* aURI);
private:
static bool InitializeEventTable();

6
dom/base/nsNoDataProtocolContentPolicy.cpp
Просмотреть файл

@ -46,7 +46,11 @@ nsNoDataProtocolContentPolicy::ShouldLoad(nsIURI* aContentLocation,
return NS_OK;
}
if (nsContentUtils::IsExternalProtocol(aContentLocation)) {
bool shouldBlock;
nsresult rv = NS_URIChainHasFlags(
aContentLocation, nsIProtocolHandler::URI_DOES_NOT_RETURN_DATA,
&shouldBlock);
if (NS_SUCCEEDED(rv) && shouldBlock) {
NS_SetRequestBlockingReason(
aLoadInfo,
nsILoadInfo::BLOCKING_REASON_CONTENT_POLICY_NO_DATA_PROTOCOL);

1
dom/base/test/fullscreen/browser.ini
Просмотреть файл

@ -37,4 +37,3 @@ support-files =
file_fullscreen-bug-1798219-2.html
[browser_fullscreen-window-open-race.js]
[browser_fullscreen-sizemode.js]
[browser_fullscreen_exit_on_external_protocol.js]

160
dom/base/test/fullscreen/browser_fullscreen_exit_on_external_protocol.js
Просмотреть файл

@ -1,160 +0,0 @@
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
SimpleTest.requestCompleteLog();
requestLongerTimeout(2);
// Import helpers
Services.scriptloader.loadSubScript(
"chrome://mochitests/content/browser/dom/base/test/fullscreen/fullscreen_helpers.js",
this
);
add_setup(async function() {
await pushPrefs(
["full-screen-api.transition-duration.enter", "0 0"],
["full-screen-api.transition-duration.leave", "0 0"],
["full-screen-api.allow-trusted-requests-only", false]
);
});
const { HandlerServiceTestUtils } = ChromeUtils.importESModule(
"resource://testing-common/HandlerServiceTestUtils.sys.mjs"
);
const gHandlerSvc = Cc["@mozilla.org/uriloader/handler-service;1"].getService(
Ci.nsIHandlerService
);
const CONTENT = `data:text/html,
<!DOCTYPE html>
<html>
<body>
<button>
<a href="mailto:test@example.com"></a>
</button>
</body>
</html>
`;
// This test tends to trigger a race in the fullscreen time telemetry,
// where the fullscreen enter and fullscreen exit events (which use the
// same histogram ID) overlap. That causes TelemetryStopwatch to log an
// error.
SimpleTest.ignoreAllUncaughtExceptions(true);
function setupMailHandler() {
let mailHandlerInfo = HandlerServiceTestUtils.getHandlerInfo("mailto");
let gOldMailHandlers = [];
// Remove extant web handlers because they have icons that
// we fetch from the web, which isn't allowed in tests.
let handlers = mailHandlerInfo.possibleApplicationHandlers;
for (let i = handlers.Count() - 1; i >= 0; i--) {
try {
let handler = handlers.queryElementAt(i, Ci.nsIWebHandlerApp);
gOldMailHandlers.push(handler);
// If we get here, this is a web handler app. Remove it:
handlers.removeElementAt(i);
} catch (ex) {}
}
let previousHandling = mailHandlerInfo.alwaysAskBeforeHandling;
mailHandlerInfo.alwaysAskBeforeHandling = true;
// Create a dummy web mail handler so we always know the mailto: protocol.
// Without this, the test fails on VMs without a default mailto: handler,
// because no dialog is ever shown, as we ignore subframe navigations to
// protocols that cannot be handled.
let dummy = Cc["@mozilla.org/uriloader/web-handler-app;1"].createInstance(
Ci.nsIWebHandlerApp
);
dummy.name = "Handler 1";
dummy.uriTemplate = "https://example.com/first/%s";
mailHandlerInfo.possibleApplicationHandlers.appendElement(dummy);
gHandlerSvc.store(mailHandlerInfo);
registerCleanupFunction(() => {
// Re-add the original protocol handlers:
let mailHandlers = mailHandlerInfo.possibleApplicationHandlers;
for (let i = handlers.Count() - 1; i >= 0; i--) {
try {
// See if this is a web handler. If it is, it'll throw, otherwise,
// we will remove it.
mailHandlers.queryElementAt(i, Ci.nsIWebHandlerApp);
mailHandlers.removeElementAt(i);
} catch (ex) {}
}
for (let h of gOldMailHandlers) {
mailHandlers.appendElement(h);
}
mailHandlerInfo.alwaysAskBeforeHandling = previousHandling;
gHandlerSvc.store(mailHandlerInfo);
});
}
add_task(setupMailHandler);
add_task(async function OpenExternalProtocolOnPendingFullscreen() {
for (const useClick of [true, false]) {
await BrowserTestUtils.withNewTab(CONTENT, async browser => {
const leavelFullscreen = waitForFullscreenState(document, false, true);
await SpecialPowers.spawn(browser, [useClick], async function(
shouldClick
) {
const button = content.document.querySelector("button");
const clickDone = new Promise(r => {
button.addEventListener("click", function() {
content.document.documentElement.requestFullscreen();
// When anchor.click() is called, the fullscreen request
// is probably still pending.
if (shouldClick) {
content.document.querySelector("a").click();
} else {
content.document.location = "mailto:test@example.com";
}
r();
});
});
button.click();
await clickDone;
});
await leavelFullscreen;
ok(true, "Fullscreen should be exited");
});
}
});
add_task(async function OpenExternalProtocolOnFullscreen() {
for (const useClick of [true, false]) {
await BrowserTestUtils.withNewTab(CONTENT, async browser => {
const leavelFullscreen = waitForFullscreenState(document, false, true);
await SpecialPowers.spawn(browser, [useClick], async function(
shouldClick
) {
let button = content.document.querySelector("button");
button.addEventListener("click", function() {
content.document.documentElement.requestFullscreen();
});
button.click();
await new Promise(r => {
content.document.addEventListener("fullscreenchange", r);
});
if (shouldClick) {
content.document.querySelector("a").click();
} else {
content.document.location = "mailto:test@example.com";
}
});
await leavelFullscreen;
ok(true, "Fullscreen should be exited");
});
}
});

5
image/imgLoader.cpp
Просмотреть файл

@ -3314,10 +3314,13 @@ imgCacheValidator::OnRedirectVerifyCallback(nsresult aResult) {
// an external application, e.g. mailto:
nsCOMPtr<nsIURI> uri;
mRedirectChannel->GetURI(getter_AddRefs(uri));
bool doesNotReturnData = false;
NS_URIChainHasFlags(uri, nsIProtocolHandler::URI_DOES_NOT_RETURN_DATA,
&doesNotReturnData);
nsresult result = NS_OK;
if (nsContentUtils::IsExternalProtocol(uri)) {
if (doesNotReturnData) {
result = NS_ERROR_ABORT;
}

13
image/imgRequest.cpp
Просмотреть файл

@ -1219,8 +1219,17 @@ imgRequest::OnRedirectVerifyCallback(nsresult result) {
// Make sure we have a protocol that returns data rather than opens an
// external application, e.g. 'mailto:'.
if (nsContentUtils::IsExternalProtocol(mFinalURI)) {
mRedirectCallback->OnRedirectVerifyCallback(NS_ERROR_ABORT);
bool doesNotReturnData = false;
nsresult rv = NS_URIChainHasFlags(
mFinalURI, nsIProtocolHandler::URI_DOES_NOT_RETURN_DATA,
&doesNotReturnData);
if (NS_SUCCEEDED(rv) && doesNotReturnData) {
rv = NS_ERROR_ABORT;
}
if (NS_FAILED(rv)) {
mRedirectCallback->OnRedirectVerifyCallback(rv);
mRedirectCallback = nullptr;
return NS_OK;
}

7
parser/html/nsHtml5TreeOperation.cpp
Просмотреть файл

@ -1107,7 +1107,12 @@ nsresult nsHtml5TreeOperation::Perform(nsHtml5TreeOpExecutor* aBuilder,
// URLs that return data (e.g. "http:" URLs) should be prefixed with
// "view-source:". URLs that don't return data should just be returned
// undecorated.
if (!nsContentUtils::IsExternalProtocol(uri)) {
bool doesNotReturnData = false;
rv =
NS_URIChainHasFlags(uri, nsIProtocolHandler::URI_DOES_NOT_RETURN_DATA,
&doesNotReturnData);
NS_ENSURE_SUCCESS(rv, NS_OK);
if (!doesNotReturnData) {
viewSourceUrl.AssignLiteral("view-source:");
}