Commit 8e8f11e1 authored by Timothy Nikkel's avatar Timothy Nikkel
Browse files

Bug 1733520. Remove apz.nonwr.activate_all_scroll_frames* prefs. r=hiro 

Differential Revision: https://phabricator.services.mozilla.com/D127219
parent 5245f849

gfx/layers/apz/test/mochitest/apz_test_utils.js

+6 −16
Original line number Diff line number Diff line
@@ -784,22 +784,12 @@ function getHitTestConfig() { 
    var utils = SpecialPowers.getDOMWindowUtils(window);

    var isWebRender = utils.layerManagerType.startsWith("WebRender");

    var isWindows = getPlatform() == "windows";

    let activateAllScrollFrames = false;

    if (isWebRender) {

      activateAllScrollFrames =

    let activateAllScrollFrames =

      SpecialPowers.getBoolPref("apz.wr.activate_all_scroll_frames") ||

      (SpecialPowers.getBoolPref(

        "apz.wr.activate_all_scroll_frames_when_fission"

      ) &&

        SpecialPowers.getBoolPref("fission.autostart"));

    } else {

      activateAllScrollFrames =

        SpecialPowers.getBoolPref("apz.nonwr.activate_all_scroll_frames") ||

        (SpecialPowers.getBoolPref(

          "apz.nonwr.activate_all_scroll_frames_when_fission"

        ) &&

          SpecialPowers.getBoolPref("fission.autostart"));

    }



    window.hitTestConfig = {

      utils,

gfx/layers/apz/test/mochitest/browser_test_scrolling_on_inactive_scroller_in_extension_popup_window.js

+0 −2
Original line number Diff line number Diff line
@@ -77,8 +77,6 @@ add_task(async () => { 
      ["apz.popups.enabled", true],

      ["apz.wr.activate_all_scroll_frames", false],

      ["apz.wr.activate_all_scroll_frames_when_fission", false],

      ["apz.nonwr.activate_all_scroll_frames", false],

      ["apz.nonwr.activate_all_scroll_frames_when_fission", false],

    ],

  });

gfx/layers/apz/test/mochitest/helper_hittest_bug1715369.html

+0 −16
Original line number Diff line number Diff line
@@ -27,22 +27,6 @@ async function makeActive(x, y, targetId) { 
}



async function test() {

  {

    // This test doesn't work correctly if run in a fission + non-wr

    // environment when we aren't activating all scroll frames, so skip

    // running any tests that case.

    let utils = SpecialPowers.getDOMWindowUtils(window);

    let isWebRender = utils.layerManagerType.startsWith("WebRender");

    let isFission = SpecialPowers.useRemoteSubframes;

    if (isFission && !isWebRender &&

        !SpecialPowers.getBoolPref("apz.nonwr.activate_all_scroll_frames") &&

        !SpecialPowers.getBoolPref("apz.nonwr.activate_all_scroll_frames_when_fission")) {

      ok(true, "no tests run due to fission + non-webrender environment without activate all scroll frames");

      return;

    }

  }





  await makeActive(20, 20, "scrollable");



  let clickPromise = new Promise(resolve => {

layout/generic/nsGfxScrollFrame.cpp

+0 −6
Original line number Diff line number Diff line
@@ -4325,15 +4325,9 @@ nsRect ScrollFrameHelper::RestrictToRootDisplayPort( 
}



/* static */ bool ScrollFrameHelper::ShouldActivateAllScrollFrames() {

  if (gfxVars::UseWebRender()) {

    return (StaticPrefs::apz_wr_activate_all_scroll_frames() ||

            (StaticPrefs::apz_wr_activate_all_scroll_frames_when_fission() &&

             FissionAutostart()));

  } else {

    return (StaticPrefs::apz_nonwr_activate_all_scroll_frames() ||

            (StaticPrefs::apz_nonwr_activate_all_scroll_frames_when_fission() &&

             FissionAutostart()));

  }

}



bool ScrollFrameHelper::DecideScrollableLayer(

modules/libpref/init/StaticPrefList.yaml

+0 −10
Original line number Diff line number Diff line
@@ -289,16 +289,6 @@ 
  value: true

  mirror: always



- name: apz.nonwr.activate_all_scroll_frames

  type: RelaxedAtomicBool

  value: false

  mirror: always



- name: apz.nonwr.activate_all_scroll_frames_when_fission

  type: RelaxedAtomicBool

  value: false

  mirror: always



- name: apz.prefer_jank_minimal_displayports

  type: RelaxedAtomicBool

  value: true