From bc984989e93a8b65a4d9986ff42c47cb891a2d89 Mon Sep 17 00:00:00 2001 From: Patrick Brosset Date: Tue, 7 Jan 2020 22:01:56 +0000 Subject: [PATCH] Bug 1605342 - Let RDM's metaviewport handling ride the trains r=bradwerth After the gradual rollout of the feature in 72, we can turn it on for all users Differential Revision: https://phabricator.services.mozilla.com/D58943 --HG-- extra : moz-landing-system : lando --- browser/app/profile/firefox.js | 9 +-------- .../responsive/test/browser/browser_device_width.js | 2 -- .../client/responsive/test/browser/browser_scroll.js | 4 ---- .../browser/browser_viewport_resizing_after_reload.js | 5 ----- .../browser/browser_viewport_resizing_fixed_width.js | 5 ----- .../browser_viewport_resizing_fixed_width_and_zoom.js | 5 ----- .../browser/browser_viewport_resizing_minimum_scale.js | 5 ----- .../test/browser/browser_viewport_resizing_scrollbar.js | 6 ++---- .../browser_viewport_zoom_resolution_invariant.js | 5 ----- 9 files changed, 3 insertions(+), 43 deletions(-) diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js index 13c9f6bf8aca..bfe88dc37176 100644 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js @@ -2238,14 +2238,7 @@ pref("devtools.responsive.reloadNotification.enabled", true); pref("devtools.responsive.touchSimulation.enabled", false); // Whether or not meta viewport is enabled, if and only if touchSimulation // is also enabled. -// For now this is only available in nightly, dev-edition and early betas. It is planned -// to be gradually rolled out with release 72. Starting with 73, this pref needs to be set -// to true on all channels. -#if defined(EARLY_BETA_OR_EARLIER) || defined(MOZ_DEV_EDITION) - pref("devtools.responsive.metaViewport.enabled", true); -#else - pref("devtools.responsive.metaViewport.enabled", false); -#endif +pref("devtools.responsive.metaViewport.enabled", true); // The user agent of the viewport. pref("devtools.responsive.userAgent", ""); // Whether or not the RDM UI is embedded in the browser. diff --git a/devtools/client/responsive/test/browser/browser_device_width.js b/devtools/client/responsive/test/browser/browser_device_width.js index e58d24d3512e..73796121b1e4 100644 --- a/devtools/client/responsive/test/browser/browser_device_width.js +++ b/devtools/client/responsive/test/browser/browser_device_width.js @@ -10,8 +10,6 @@ const TEST_URL = addRDMTask( TEST_URL, async function({ ui, manager }) { - await pushPref("devtools.responsive.metaViewport.enabled", true); - ok(ui, "An instance of the RDM should be attached to the tab."); await setViewportSizeAndAwaitReflow(ui, manager, 110, 500); diff --git a/devtools/client/responsive/test/browser/browser_scroll.js b/devtools/client/responsive/test/browser/browser_scroll.js index 9b3bbf364319..dccc0d706571 100644 --- a/devtools/client/responsive/test/browser/browser_scroll.js +++ b/devtools/client/responsive/test/browser/browser_scroll.js @@ -16,10 +16,6 @@ const TEST_URL = '
'; addRDMTask(TEST_URL, async function({ ui, manager }) { - await SpecialPowers.pushPrefEnv({ - set: [["devtools.responsive.metaViewport.enabled", true]], - }); - // Wait until the viewport has been added and the device list has been loaded const { store } = ui.toolWindow; await waitUntilState( 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 d04fc8e1bb7d..4e38dd2d932b 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 @@ -14,11 +14,6 @@ const TEST_URL = ""; addRDMTask(TEST_URL, async function({ ui, manager }) { - // Turn on the pref that allows meta viewport support. - await SpecialPowers.pushPrefEnv({ - set: [["devtools.responsive.metaViewport.enabled", true]], - }); - const store = ui.toolWindow.store; // Wait until the viewport has been added. 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 32086631b4a7..dcc46b232517 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 @@ -10,11 +10,6 @@ const TEST_URL = '' + "meta viewport width 300"; addRDMTask(TEST_URL, async function({ ui, manager }) { - // Turn on the pref that allows meta viewport support. - await SpecialPowers.pushPrefEnv({ - set: [["devtools.responsive.metaViewport.enabled", true]], - }); - const store = ui.toolWindow.store; // Wait until the viewport has been added. diff --git a/devtools/client/responsive/test/browser/browser_viewport_resizing_fixed_width_and_zoom.js b/devtools/client/responsive/test/browser/browser_viewport_resizing_fixed_width_and_zoom.js index 878efe4d6b4d..c84e096a52c2 100644 --- a/devtools/client/responsive/test/browser/browser_viewport_resizing_fixed_width_and_zoom.js +++ b/devtools/client/responsive/test/browser/browser_viewport_resizing_fixed_width_and_zoom.js @@ -11,11 +11,6 @@ const TEST_URL = 'initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0">' + "meta viewport scaled locked at 1.0"; addRDMTask(TEST_URL, async function({ ui, manager }) { - // Turn on the pref that allows meta viewport support. - await SpecialPowers.pushPrefEnv({ - set: [["devtools.responsive.metaViewport.enabled", true]], - }); - const store = ui.toolWindow.store; // Wait until the viewport has been added. diff --git a/devtools/client/responsive/test/browser/browser_viewport_resizing_minimum_scale.js b/devtools/client/responsive/test/browser/browser_viewport_resizing_minimum_scale.js index 1776928963a5..fe2d11f63285 100644 --- a/devtools/client/responsive/test/browser/browser_viewport_resizing_minimum_scale.js +++ b/devtools/client/responsive/test/browser/browser_viewport_resizing_minimum_scale.js @@ -12,11 +12,6 @@ const TEST_URL = '
test
' + ""; addRDMTask(TEST_URL, async function({ ui, manager }) { - // Turn on the pref that allows meta viewport support. - await SpecialPowers.pushPrefEnv({ - set: [["devtools.responsive.metaViewport.enabled", true]], - }); - const store = ui.toolWindow.store; // Wait until the viewport has been added. diff --git a/devtools/client/responsive/test/browser/browser_viewport_resizing_scrollbar.js b/devtools/client/responsive/test/browser/browser_viewport_resizing_scrollbar.js index f1ec25b6a9c3..98957fbbc7ca 100644 --- a/devtools/client/responsive/test/browser/browser_viewport_resizing_scrollbar.js +++ b/devtools/client/responsive/test/browser/browser_viewport_resizing_scrollbar.js @@ -49,12 +49,10 @@ const TEST_URL = '
'; addRDMTask(TEST_URL, async function({ ui, manager }) { - // Turn on the prefs that allow meta viewport support, and force overlay - // scrollbars to always be visible, and to allow data URIs to be considered - // as same-origin. + // Turn on the prefs that force overlay scrollbars to always be visible, and to allow + // data URIs to be considered as same-origin. await SpecialPowers.pushPrefEnv({ set: [ - ["devtools.responsive.metaViewport.enabled", true], ["layout.testing.overlay-scrollbars.always-visible", true], ["security.data_uri.unique_opaque_origin", false], ], diff --git a/devtools/client/responsive/test/browser/browser_viewport_zoom_resolution_invariant.js b/devtools/client/responsive/test/browser/browser_viewport_zoom_resolution_invariant.js index e1fe6abb2b30..8720e977039c 100644 --- a/devtools/client/responsive/test/browser/browser_viewport_zoom_resolution_invariant.js +++ b/devtools/client/responsive/test/browser/browser_viewport_zoom_resolution_invariant.js @@ -50,11 +50,6 @@ for (const { content, res_target } of TESTS) { `Using meta viewport content "${content}" with new RDM UI ${usingBrowserUI}.` ); - // Turn on the pref that allows meta viewport support. - await SpecialPowers.pushPrefEnv({ - set: [["devtools.responsive.metaViewport.enabled", true]], - }); - await setViewportSize(ui, manager, WIDTH, HEIGHT); await setTouchAndMetaViewportSupport(ui, true);