From 473e2d336ef26873f71dc520648114b1b0c658f0 Mon Sep 17 00:00:00 2001
From: Gijs Kruitbosch <gijskruitbosch@gmail.com>
Date: Fri, 31 Mar 2023 14:43:06 +0000
Subject: [PATCH] Bug 1818604 - unbreak loading files using 'open file' in the
layout debugger, r=emilio
Differential Revision: https://phabricator.services.mozilla.com/D174240
---
.../layout-debug/ui/content/layoutdebug.js | 47 +++++++++++++------
1 file changed, 32 insertions(+), 15 deletions(-)
diff --git a/layout/tools/layout-debug/ui/content/layoutdebug.js b/layout/tools/layout-debug/ui/content/layoutdebug.js
index ed7bd899e518a..0452a7a2c01f5 100644
--- a/layout/tools/layout-debug/ui/content/layoutdebug.js
+++ b/layout/tools/layout-debug/ui/content/layoutdebug.js
@@ -356,8 +356,7 @@ function OnLDBLoad() {
if (gArgs.url) {
// Switch to the right kind of content process, and wait a bit so that
// the profiler has had a chance to attach to it.
- updateBrowserRemotenessByURL(gArgs.url);
- setTimeout(() => fixupAndLoadURIString(gArgs.url), 3000);
+ loadStringURI(gArgs.url, { delayLoad: 3000 });
return;
}
} else {
@@ -369,7 +368,7 @@ function OnLDBLoad() {
gDebugger._pagedMode = gArgs.paged;
if (gArgs.url) {
- fixupAndLoadURIString(gArgs.url);
+ loadStringURI(gArgs.url);
}
// Some command line arguments may toggle menu items. Call this after
@@ -452,7 +451,7 @@ function openFile() {
fp.fileURL.spec &&
fp.fileURL.spec.length > 0
) {
- gBrowser.loadURI(fp.fileURL);
+ loadURIObject(fp.fileURL);
}
});
}
@@ -460,14 +459,13 @@ function openFile() {
// A simplified version of the function with the same name in tabbrowser.js.
function updateBrowserRemotenessByURL(aURL) {
let oa = E10SUtils.predictOriginAttributes({ browser: gBrowser });
- let remoteType = E10SUtils.getRemoteTypeForURI(
- aURL,
- gMultiProcessBrowser,
- gFissionBrowser,
- gBrowser.remoteType,
- gBrowser.currentURI,
- oa
- );
+ let remoteType = E10SUtils.getRemoteTypeForURIObject(aURL, {
+ multiProcess: gMultiProcessBrowser,
+ remoteSubFrames: gFissionBrowser,
+ preferredRemoteType: gBrowser.remoteType,
+ currentURI: gBrowser.currentURI,
+ originAttributes: oa,
+ });
if (gBrowser.remoteType != remoteType) {
gDebugger.detachBrowser();
if (remoteType == E10SUtils.NOT_REMOTE) {
@@ -483,11 +481,30 @@ function updateBrowserRemotenessByURL(aURL) {
}
}
-function fixupAndLoadURIString(aURL) {
+function loadStringURI(aURLString, aOptions) {
+ let realURL;
+ try {
+ realURL = Services.uriFixup.getFixupURIInfo(aURLString).preferredURI;
+ } catch (ex) {
+ alert(
+ "Couldn't work out how to create a URL from input: " +
+ aURLString.substring(0, 100)
+ );
+ return;
+ }
+ return loadURIObject(realURL, aOptions);
+}
+
+async function loadURIObject(aURL, { delayLoad } = {}) {
// We don't bother trying to handle navigations within the browser to new URLs
// that should be loaded in a different process.
updateBrowserRemotenessByURL(aURL);
- gBrowser.fixupAndLoadURIString(aURL, {
+ // When attaching the profiler we may want to delay the actual load a bit
+ // after switching remoteness.
+ if (delayLoad) {
+ await new Promise(r => setTimeout(r, delayLoad));
+ }
+ gBrowser.loadURI(aURL, {
triggeringPrincipal: Services.scriptSecurityManager.getSystemPrincipal(),
});
}
@@ -498,6 +515,6 @@ function focusURLBar() {
}
function go() {
- fixupAndLoadURIString(gURLBar.value);
+ loadStringURI(gURLBar.value);
gBrowser.focus();
}
--
GitLab