From 84fc68c00108061dd0a38112c73925a30bcb4166 Mon Sep 17 00:00:00 2001 From: Botond Ballo Date: Thu, 2 Jun 2022 22:57:56 +0000 Subject: [PATCH] Bug 1771822 - Do not explicitly set dom.visualviewport.enabled in tests. r=tnikkel This pref is now enabled by default on all platforms. Depends on D147810 Differential Revision: https://phabricator.services.mozilla.com/D147811 --- .../test/browser_scrollPositions.js | 12 +---------- .../test/browser_scrollPositionsReaderMode.js | 6 +----- dom/base/test/test_domwindowutils.html | 4 +--- ...viewport_metrics_on_landscape_content.html | 1 - .../test_group_double_tap_zoom-2.html | 20 +++++++------------ .../mochitest/test_group_double_tap_zoom.html | 17 ++++++---------- .../test/mochitest/test_group_fullscreen.html | 1 - .../test_group_minimum_scale_size.html | 2 -- .../mochitest/test_group_pointerevents.html | 8 ++++---- .../mochitest/test_group_touchevents-4.html | 7 +++---- .../mochitest/test_group_touchevents.html | 5 +---- .../apz/test/mochitest/test_group_zoom-2.html | 2 -- .../apz/test/mochitest/test_group_zoom.html | 2 -- .../tests/browser_visual_viewport_iframe.js | 1 - .../meta/css/css-device-adapt/__dir__.ini | 3 +-- .../meta/visual-viewport/__dir__.ini | 2 +- 16 files changed, 26 insertions(+), 67 deletions(-) diff --git a/browser/components/sessionstore/test/browser_scrollPositions.js b/browser/components/sessionstore/test/browser_scrollPositions.js index 5443149ffa49..67fa7571791f 100644 --- a/browser/components/sessionstore/test/browser_scrollPositions.js +++ b/browser/components/sessionstore/test/browser_scrollPositions.js @@ -57,9 +57,6 @@ function getScrollPosition(bc) { * for an average page without any frames. */ async function test_scroll(aURL) { - // Needed for setScrollPosition() - await pushPrefs(["dom.visualviewport.enabled", true]); - let tab = BrowserTestUtils.addTab(gBrowser, aURL); let browser = tab.linkedBrowser; await promiseBrowserLoaded(browser); @@ -110,9 +107,6 @@ async function test_scroll(aURL) { * for multiple frames of pages with framesets. */ async function test_scroll_nested() { - // Needed for setScrollPosition() - await pushPrefs(["dom.visualviewport.enabled", true]); - let tab = BrowserTestUtils.addTab(gBrowser, URL_FRAMESET); let browser = tab.linkedBrowser; await promiseBrowserLoaded(browser); @@ -185,11 +179,7 @@ async function test_scroll_nested() { * are preserved as well (bug 1265818). */ async function test_scroll_background_tabs(aURL) { - await pushPrefs( - ["browser.sessionstore.restore_on_demand", true], - // Needed for setScrollPosition() - ["dom.visualviewport.enabled", true] - ); + await pushPrefs(["browser.sessionstore.restore_on_demand", true]); let newWin = await BrowserTestUtils.openNewBrowserWindow(); let tab = BrowserTestUtils.addTab(newWin.gBrowser, aURL); diff --git a/browser/components/sessionstore/test/browser_scrollPositionsReaderMode.js b/browser/components/sessionstore/test/browser_scrollPositionsReaderMode.js index 591206ddec39..c61b37c1a41f 100644 --- a/browser/components/sessionstore/test/browser_scrollPositionsReaderMode.js +++ b/browser/components/sessionstore/test/browser_scrollPositionsReaderMode.js @@ -19,11 +19,7 @@ requestLongerTimeout(2); * tabs in a restored window (bug 1153393). */ add_task(async function test_scroll_background_about_reader_tabs() { - await pushPrefs( - ["browser.sessionstore.restore_on_demand", true], - // Needed for setScrollPosition() - ["dom.visualviewport.enabled", true] - ); + await pushPrefs(["browser.sessionstore.restore_on_demand", true]); let newWin = await BrowserTestUtils.openNewBrowserWindow(); let tab = BrowserTestUtils.addTab(newWin.gBrowser, READER_MODE_URL); diff --git a/dom/base/test/test_domwindowutils.html b/dom/base/test/test_domwindowutils.html index 7803edced75a..7485669d90b9 100644 --- a/dom/base/test/test_domwindowutils.html +++ b/dom/base/test/test_domwindowutils.html @@ -93,9 +93,7 @@ function test_getUnanimatedComputedStyle() { } function test_setDynamicToolbarMaxHeight() { - SpecialPowers.pushPrefEnv({ - set: [["dom.visualviewport.enabled", true]] - }).then(() => window.open("file_domwindowutils_dynamic_toolbar.html")); + window.open("file_domwindowutils_dynamic_toolbar.html"); } var tests = [ diff --git a/dom/base/test/test_viewport_metrics_on_landscape_content.html b/dom/base/test/test_viewport_metrics_on_landscape_content.html index 1b4f78c7deea..f3f5d928175f 100644 --- a/dom/base/test/test_viewport_metrics_on_landscape_content.html +++ b/dom/base/test/test_viewport_metrics_on_landscape_content.html @@ -12,7 +12,6 @@ SpecialPowers.pushPrefEnv({ "set": [ ["apz.allow_zooming", true], ["dom.meta-viewport.enabled", true], - ["dom.visualviewport.enabled", true], ] }, () => { // We need to open a new window to avoid running tests in an iframe since diff --git a/gfx/layers/apz/test/mochitest/test_group_double_tap_zoom-2.html b/gfx/layers/apz/test/mochitest/test_group_double_tap_zoom-2.html index 15c707ee1963..16e04f7c2ac8 100644 --- a/gfx/layers/apz/test/mochitest/test_group_double_tap_zoom-2.html +++ b/gfx/layers/apz/test/mochitest/test_group_double_tap_zoom-2.html @@ -17,14 +17,8 @@ var doubletap_prefs = [ ["apz.mac.enable_double_tap_zoom_touchpad_gesture", true], ]; -var visualviewport_and_doubletap_prefs = [ +var longeranimation_doubletap_prefs = [ ...doubletap_prefs, - ["dom.visualviewport.enabled", true], -]; - -var longeranimation_visualviewport_and_doubletap_prefs = [ - ...doubletap_prefs, - ["dom.visualviewport.enabled", true], ["apz.zoom_animation_duration_ms", 1000], ]; @@ -44,7 +38,7 @@ var meta_viewport_and_doubletap_prefs = [ ]; var subtests = [ - {"file": "helper_doubletap_zoom_smooth.html", "prefs": longeranimation_visualviewport_and_doubletap_prefs}, + {"file": "helper_doubletap_zoom_smooth.html", "prefs": longeranimation_doubletap_prefs}, {"file": "helper_doubletap_zoom_fixedpos_overflow.html", "prefs": logging_and_doubletap_prefs}, {"file": "helper_doubletap_zoom_hscrollable.html", "prefs": disable_default_zoomin_and_doubletap_prefs}, {"file": "helper_doubletap_zoom_scrolled_overflowhidden.html", "prefs": doubletap_prefs}, @@ -53,8 +47,8 @@ var subtests = [ {"file": "helper_doubletap_zoom_gencon.html", "prefs": doubletap_prefs}, {"file": "helper_doubletap_zoom_hscrollable2.html", "prefs": doubletap_prefs}, {"file": "helper_doubletap_zoom_nothing.html", "prefs": doubletap_prefs}, - {"file": "helper_doubletap_zoom_noscroll.html", "prefs": visualviewport_and_doubletap_prefs}, - {"file": "helper_doubletap_zoom_square.html", "prefs": visualviewport_and_doubletap_prefs}, + {"file": "helper_doubletap_zoom_noscroll.html", "prefs": doubletap_prefs}, + {"file": "helper_doubletap_zoom_square.html", "prefs": doubletap_prefs}, {"file": "helper_doubletap_zoom_oopif.html", "prefs": doubletap_prefs}, {"file": "helper_disallow_doubletap_zoom_inside_oopif.html", "prefs": meta_viewport_and_doubletap_prefs}, {"file": "helper_doubletap_zoom_nothing_listener.html", "prefs": doubletap_prefs}, @@ -62,7 +56,7 @@ var subtests = [ if (getPlatform() == "mac") { subtests.push( - {"file": "helper_doubletap_zoom_smooth.html?touchpad", "prefs": longeranimation_visualviewport_and_doubletap_prefs}, + {"file": "helper_doubletap_zoom_smooth.html?touchpad", "prefs": longeranimation_doubletap_prefs}, {"file": "helper_doubletap_zoom_fixedpos_overflow.html?touchpad", "prefs": logging_and_doubletap_prefs}, {"file": "helper_doubletap_zoom_hscrollable.html?touchpad", "prefs": disable_default_zoomin_and_doubletap_prefs}, {"file": "helper_doubletap_zoom_scrolled_overflowhidden.html?touchpad", "prefs": doubletap_prefs}, @@ -71,8 +65,8 @@ if (getPlatform() == "mac") { {"file": "helper_doubletap_zoom_gencon.html?touchpad", "prefs": doubletap_prefs}, {"file": "helper_doubletap_zoom_hscrollable2.html?touchpad", "prefs": doubletap_prefs}, {"file": "helper_doubletap_zoom_nothing.html?touchpad", "prefs": doubletap_prefs}, - {"file": "helper_doubletap_zoom_noscroll.html?touchpad", "prefs": visualviewport_and_doubletap_prefs}, - {"file": "helper_doubletap_zoom_square.html?touchpad", "prefs": visualviewport_and_doubletap_prefs}, + {"file": "helper_doubletap_zoom_noscroll.html?touchpad", "prefs": doubletap_prefs}, + {"file": "helper_doubletap_zoom_square.html?touchpad", "prefs": doubletap_prefs}, {"file": "helper_doubletap_zoom_oopif.html?touchpad", "prefs": doubletap_prefs}, {"file": "helper_disallow_doubletap_zoom_inside_oopif.html?touchpad", "prefs": meta_viewport_and_doubletap_prefs}, {"file": "helper_doubletap_zoom_nothing_listener.html?touchpad", "prefs": doubletap_prefs}, diff --git a/gfx/layers/apz/test/mochitest/test_group_double_tap_zoom.html b/gfx/layers/apz/test/mochitest/test_group_double_tap_zoom.html index d739d548f607..078a66469732 100644 --- a/gfx/layers/apz/test/mochitest/test_group_double_tap_zoom.html +++ b/gfx/layers/apz/test/mochitest/test_group_double_tap_zoom.html @@ -17,11 +17,6 @@ var doubletap_prefs = [ ["apz.mac.enable_double_tap_zoom_touchpad_gesture", true], ]; -var visualviewport_and_doubletap_prefs = [ - ...doubletap_prefs, - ["dom.visualviewport.enabled", true], -]; - var logging_and_doubletap_prefs = [ ...doubletap_prefs, ["apz.test.logging_enabled", true], @@ -31,11 +26,11 @@ var subtests = [ {"file": "helper_doubletap_zoom.html", "prefs": doubletap_prefs}, {"file": "helper_doubletap_zoom_img.html", "prefs": doubletap_prefs}, {"file": "helper_doubletap_zoom_textarea.html", "prefs": doubletap_prefs}, - {"file": "helper_doubletap_zoom_horizontal_center.html", "prefs": visualviewport_and_doubletap_prefs}, - {"file": "helper_doubletap_zoom_bug1702464.html", "prefs": visualviewport_and_doubletap_prefs}, + {"file": "helper_doubletap_zoom_horizontal_center.html", "prefs": doubletap_prefs}, + {"file": "helper_doubletap_zoom_bug1702464.html", "prefs": doubletap_prefs}, {"file": "helper_doubletap_zoom_large_overflow.html", "prefs": doubletap_prefs}, {"file": "helper_doubletap_zoom_fixedpos.html", "prefs": logging_and_doubletap_prefs}, - {"file": "helper_doubletap_zoom_tallwide.html", "prefs": visualviewport_and_doubletap_prefs}, + {"file": "helper_doubletap_zoom_tallwide.html", "prefs": doubletap_prefs}, ]; if (getPlatform() == "mac") { @@ -43,15 +38,15 @@ if (getPlatform() == "mac") { {"file": "helper_doubletap_zoom.html?touchpad", "prefs": doubletap_prefs}, {"file": "helper_doubletap_zoom_img.html?touchpad", "prefs": doubletap_prefs}, {"file": "helper_doubletap_zoom_textarea.html?touchpad", "prefs": doubletap_prefs}, - {"file": "helper_doubletap_zoom_horizontal_center.html?touchpad", "prefs": visualviewport_and_doubletap_prefs}, + {"file": "helper_doubletap_zoom_horizontal_center.html?touchpad", "prefs": doubletap_prefs}, {"file": "helper_doubletap_zoom_small.html", "prefs": doubletap_prefs}, {"file": "helper_doubletap_zoom_small.html?touchpad", "prefs": doubletap_prefs}, - {"file": "helper_doubletap_zoom_bug1702464.html?touchpad", "prefs": visualviewport_and_doubletap_prefs}, + {"file": "helper_doubletap_zoom_bug1702464.html?touchpad", "prefs": doubletap_prefs}, {"file": "helper_doubletap_zoom_htmlelement.html", "prefs": doubletap_prefs}, // scrollbars don't receive events or take space on android {"file": "helper_doubletap_zoom_htmlelement.html?touchpad", "prefs": doubletap_prefs}, {"file": "helper_doubletap_zoom_large_overflow.html?touchpad", "prefs": doubletap_prefs}, {"file": "helper_doubletap_zoom_fixedpos.html?touchpad", "prefs": logging_and_doubletap_prefs}, - {"file": "helper_doubletap_zoom_tallwide.html?touchpad", "prefs": visualviewport_and_doubletap_prefs}, + {"file": "helper_doubletap_zoom_tallwide.html?touchpad", "prefs": doubletap_prefs}, ); } diff --git a/gfx/layers/apz/test/mochitest/test_group_fullscreen.html b/gfx/layers/apz/test/mochitest/test_group_fullscreen.html index 43bcfbdef325..c31a3abffb22 100644 --- a/gfx/layers/apz/test/mochitest/test_group_fullscreen.html +++ b/gfx/layers/apz/test/mochitest/test_group_fullscreen.html @@ -14,7 +14,6 @@ prefs: [ ["apz.test.logging_enabled", true], ["full-screen-api.allow-trusted-requests-only", false], - ["dom.visualviewport.enabled", true], ], }, ]; diff --git a/gfx/layers/apz/test/mochitest/test_group_minimum_scale_size.html b/gfx/layers/apz/test/mochitest/test_group_minimum_scale_size.html index e965a0a55920..577d273f378c 100644 --- a/gfx/layers/apz/test/mochitest/test_group_minimum_scale_size.html +++ b/gfx/layers/apz/test/mochitest/test_group_minimum_scale_size.html @@ -27,8 +27,6 @@ const prefs = [ // Similarly, explicitly enable support for meta viewport tags (which the // test cases use) so they're processed even on desktop. ["dom.meta-viewport.enabled", true], - // We use the Visual Viewport API to tell the visual viewport offset. - ["dom.visualviewport.enabled", true], ]; const subtests = [ diff --git a/gfx/layers/apz/test/mochitest/test_group_pointerevents.html b/gfx/layers/apz/test/mochitest/test_group_pointerevents.html index ae771dff4a74..21fa4585de8d 100644 --- a/gfx/layers/apz/test/mochitest/test_group_pointerevents.html +++ b/gfx/layers/apz/test/mochitest/test_group_pointerevents.html @@ -20,12 +20,12 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=1285070 {"file": "helper_bug1299195.html", "prefs": [["dom.meta-viewport.enabled", isMac]]}, {"file": "helper_bug1414336.html", "prefs": [["apz.test.fails_with_native_injection", isWindows]]}, {"file": "helper_bug1502010_unconsumed_pan.html"}, - {"file": "helper_bug1544966_zoom_on_touch_action_none.html", "prefs": [...touch_action_prefs]}, - {"file": "helper_bug1648491_no_pointercancel_with_dtc.html", "prefs": [...touch_action_prefs]}, + {"file": "helper_bug1544966_zoom_on_touch_action_none.html", "prefs": touch_action_prefs}, + {"file": "helper_bug1648491_no_pointercancel_with_dtc.html", "prefs": touch_action_prefs}, {"file": "helper_bug1663731_no_pointercancel_on_second_touchstart.html", - "prefs": [["dom.visualviewport.enabled", true], ...touch_action_prefs]}, + "prefs": touch_action_prefs}, {"file": "helper_bug1682170_pointercancel_on_touchaction_pinchzoom.html", - "prefs": [["dom.visualviewport.enabled", true], ...touch_action_prefs]}, + "prefs": touch_action_prefs}, ]; if (isApzEnabled()) { diff --git a/gfx/layers/apz/test/mochitest/test_group_touchevents-4.html b/gfx/layers/apz/test/mochitest/test_group_touchevents-4.html index 881a5d47e2db..0050afe1a87e 100644 --- a/gfx/layers/apz/test/mochitest/test_group_touchevents-4.html +++ b/gfx/layers/apz/test/mochitest/test_group_touchevents-4.html @@ -17,17 +17,16 @@ var subtests = [ // Resetting isFirstPaint shouldn't clobber the visual viewport {"file": "helper_bug1509575.html", "prefs": [ ["apz.allow_zooming", true], - ["dom.visualviewport.enabled", true], ...getPrefs("TOUCH_EVENTS:PAN") ]}, // Exercise one of the main-thread touch-action determination codepaths. {"file": "helper_bug1506497_touch_action_fixed_on_fixed.html", "prefs": touch_action_prefs}, {"file": "helper_bug1637113_main_thread_hit_test.html", - "prefs": [["apz.allow_zooming", true], ["dom.visualviewport.enabled", true]]}, + "prefs": [["apz.allow_zooming", true]]}, {"file": "helper_bug1638458_contextmenu.html", - "prefs": [["apz.allow_zooming", true], ["dom.visualviewport.enabled", true]]}, + "prefs": [["apz.allow_zooming", true]]}, {"file": "helper_bug1638441_fixed_pos_hit_test.html", - "prefs": [["apz.allow_zooming", true], ["dom.visualviewport.enabled", true]]}, + "prefs": [["apz.allow_zooming", true]]}, {"file": "helper_bug1637135_narrow_viewport.html", "prefs": [["apz.allow_zooming", true], ["dom.meta-viewport.enabled", true]]}, {"file": "helper_bug1714934_mouseevent_buttons.html"}, diff --git a/gfx/layers/apz/test/mochitest/test_group_touchevents.html b/gfx/layers/apz/test/mochitest/test_group_touchevents.html index f3e2fd183ce4..df24e24f3d56 100644 --- a/gfx/layers/apz/test/mochitest/test_group_touchevents.html +++ b/gfx/layers/apz/test/mochitest/test_group_touchevents.html @@ -13,10 +13,7 @@ var basic_pan_prefs = getPrefs("TOUCH_EVENTS:PAN"); var subtests = [ // Simple tests to exercise basic panning behaviour - {"file": "helper_basic_pan.html", "prefs": [ - ["dom.visualviewport.enabled", true], - ...basic_pan_prefs - ]}, + {"file": "helper_basic_pan.html", "prefs": basic_pan_prefs}, {"file": "helper_div_pan.html", "prefs": basic_pan_prefs}, {"file": "helper_iframe_pan.html", "prefs": basic_pan_prefs}, diff --git a/gfx/layers/apz/test/mochitest/test_group_zoom-2.html b/gfx/layers/apz/test/mochitest/test_group_zoom-2.html index 1cebcaedf325..0c10dde2bf22 100644 --- a/gfx/layers/apz/test/mochitest/test_group_zoom-2.html +++ b/gfx/layers/apz/test/mochitest/test_group_zoom-2.html @@ -37,8 +37,6 @@ var prefs = [ // Disable touch resampling so that touch events are processed without delay // and we don't zoom more than expected due to overprediction. ["android.touch_resampling.enabled", false], - // Tests depend on window.visualViewport - ["dom.visualviewport.enabled", true], ]; var instant_repaint_prefs = [ diff --git a/gfx/layers/apz/test/mochitest/test_group_zoom.html b/gfx/layers/apz/test/mochitest/test_group_zoom.html index f383f1b8006d..bd93619f91d9 100644 --- a/gfx/layers/apz/test/mochitest/test_group_zoom.html +++ b/gfx/layers/apz/test/mochitest/test_group_zoom.html @@ -32,8 +32,6 @@ var prefs = [ // Disable touch resampling so that touch events are processed without delay // and we don't zoom more than expected due to overprediction. ["android.touch_resampling.enabled", false], - // Tests depend on window.visualViewport - ["dom.visualviewport.enabled", true], ]; // Increase the tap timeouts so the one-touch-pinch gesture is still detected diff --git a/layout/base/tests/browser_visual_viewport_iframe.js b/layout/base/tests/browser_visual_viewport_iframe.js index e940ec487a79..007141f220c2 100644 --- a/layout/base/tests/browser_visual_viewport_iframe.js +++ b/layout/base/tests/browser_visual_viewport_iframe.js @@ -13,7 +13,6 @@ add_task(async () => { set: [ ["apz.allow_zooming", true], ["dom.meta-viewport.enabled", true], - ["dom.visualviewport.enabled", true], ], }); diff --git a/testing/web-platform/meta/css/css-device-adapt/__dir__.ini b/testing/web-platform/meta/css/css-device-adapt/__dir__.ini index 70d4693d345a..5e4c0775cb3a 100644 --- a/testing/web-platform/meta/css/css-device-adapt/__dir__.ini +++ b/testing/web-platform/meta/css/css-device-adapt/__dir__.ini @@ -1,3 +1,2 @@ implementation-status: not-implementing -prefs: [dom.visualviewport.enabled:true, - apz.allow_zooming:true] +prefs: [apz.allow_zooming:true] diff --git a/testing/web-platform/meta/visual-viewport/__dir__.ini b/testing/web-platform/meta/visual-viewport/__dir__.ini index 927cb0775830..f532c1786f3e 100644 --- a/testing/web-platform/meta/visual-viewport/__dir__.ini +++ b/testing/web-platform/meta/visual-viewport/__dir__.ini @@ -1 +1 @@ -prefs: [dom.visualviewport.enabled:true, apz.allow_zooming:true] +prefs: [apz.allow_zooming:true]