From d8bbc7858622b6d9c278469aab701ca0b609cddf Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 15 May 2024 05:35:49 +0200 Subject: Merging upstream version 126.0. Signed-off-by: Daniel Baumann --- devtools/client/responsive/index.js | 4 ++-- .../test/browser/browser_device_width.js | 3 --- .../test/browser/browser_toolbox_computed_view.js | 28 ++++++++++++---------- .../browser_viewport_resizing_after_reload.js | 2 +- .../browser_viewport_resizing_fixed_width.js | 4 ++-- .../test/browser/doc_toolbox_rule_view.html | 1 + 6 files changed, 22 insertions(+), 20 deletions(-) (limited to 'devtools/client/responsive') diff --git a/devtools/client/responsive/index.js b/devtools/client/responsive/index.js index 84bdf16e12..5ee25ab95e 100644 --- a/devtools/client/responsive/index.js +++ b/devtools/client/responsive/index.js @@ -6,8 +6,8 @@ "use strict"; -const { BrowserLoader } = ChromeUtils.import( - "resource://devtools/shared/loader/browser-loader.js" +const { BrowserLoader } = ChromeUtils.importESModule( + "resource://devtools/shared/loader/browser-loader.sys.mjs" ); const { require } = BrowserLoader({ baseURI: "resource://devtools/client/responsive/", diff --git a/devtools/client/responsive/test/browser/browser_device_width.js b/devtools/client/responsive/test/browser/browser_device_width.js index 11dc8fd31c..a7d1dfde30 100644 --- a/devtools/client/responsive/test/browser/browser_device_width.js +++ b/devtools/client/responsive/test/browser/browser_device_width.js @@ -11,9 +11,6 @@ addRDMTask(TEST_URL, async function ({ ui, manager }) { ok(ui, "An instance of the RDM should be attached to the tab."); await setViewportSizeAndAwaitReflow(ui, manager, 110, 500); - info("Checking initial width/height properties."); - await doInitialChecks(ui, 110); - info("Checking initial width/height with meta viewport on"); await setTouchAndMetaViewportSupport(ui, true); await doInitialChecks(ui, 980); diff --git a/devtools/client/responsive/test/browser/browser_toolbox_computed_view.js b/devtools/client/responsive/test/browser/browser_toolbox_computed_view.js index f22ee8d246..d4d9c94c79 100644 --- a/devtools/client/responsive/test/browser/browser_toolbox_computed_view.js +++ b/devtools/client/responsive/test/browser/browser_toolbox_computed_view.js @@ -6,18 +6,22 @@ // Check that when the viewport is resized, the computed-view refreshes. const TEST_URI = - "data:text/html;charset=utf-8,
"; + "data:text/html;charset=utf-8," + + ` + +
+`; addRDMTask(TEST_URI, async function ({ ui, manager }) { info("Open the responsive design mode and set its size to 500x500 to start"); diff --git a/devtools/client/responsive/test/browser/browser_viewport_resizing_after_reload.js b/devtools/client/responsive/test/browser/browser_viewport_resizing_after_reload.js index ad750326ae..22dbdff527 100644 --- a/devtools/client/responsive/test/browser/browser_viewport_resizing_after_reload.js +++ b/devtools/client/responsive/test/browser/browser_viewport_resizing_after_reload.js @@ -23,7 +23,7 @@ addRDMTask(TEST_URL, async function ({ ui, manager }) { const expected = [ { metaSupport: false, - before: [1.0, 300, 600], + before: [0.5, 300, 600], after: [1.0, 600, 300], }, { diff --git a/devtools/client/responsive/test/browser/browser_viewport_resizing_fixed_width.js b/devtools/client/responsive/test/browser/browser_viewport_resizing_fixed_width.js index 46a2529b12..5fd38565be 100644 --- a/devtools/client/responsive/test/browser/browser_viewport_resizing_fixed_width.js +++ b/devtools/client/responsive/test/browser/browser_viewport_resizing_fixed_width.js @@ -19,8 +19,8 @@ addRDMTask(TEST_URL, async function ({ ui, manager }) { const expected = [ { metaSupport: false, - before: [1.0, 600, 300], - after: [1.0, 50, 50], // Zoom is unaffected. + before: [2.0, 300, 150], + after: [0.25, 300, 300], // This checks that min-zoom is active. }, { metaSupport: true, diff --git a/devtools/client/responsive/test/browser/doc_toolbox_rule_view.html b/devtools/client/responsive/test/browser/doc_toolbox_rule_view.html index e4a311b7ec..f0cc88ef97 100644 --- a/devtools/client/responsive/test/browser/doc_toolbox_rule_view.html +++ b/devtools/client/responsive/test/browser/doc_toolbox_rule_view.html @@ -1,4 +1,5 @@ +
-- cgit v1.2.3