From 532d39f4a4cdb989a44e198036f6f275f24ba876 Mon Sep 17 00:00:00 2001 From: Mihai Alexandru Michis Date: Sat, 1 Aug 2020 21:47:12 +0300 Subject: [PATCH] Backed out changeset b119f2d9cd45 (bug 1656418) for causing reftest failures in layout/reftests/bugs/1078262-1.html CLOSED TREE --- .../test_animation_performance_warning.html | 1 - .../chrome/test_running_on_compositor.html | 36 +++++++++---------- modules/libpref/init/StaticPrefList.yaml | 7 +--- 3 files changed, 19 insertions(+), 25 deletions(-) diff --git a/dom/animation/test/chrome/test_animation_performance_warning.html b/dom/animation/test/chrome/test_animation_performance_warning.html index aedc8c167ebb..9e498db56408 100644 --- a/dom/animation/test/chrome/test_animation_performance_warning.html +++ b/dom/animation/test/chrome/test_animation_performance_warning.html @@ -43,7 +43,6 @@ SpecialPowers.pushPrefEnv({ "set": [ // consistent pixel values in warning messages // regardless of platform DPIs. ["layout.css.devPixelsPerPx", 1], - ["layout.animation.prerender.partial", false], ] }, start); diff --git a/dom/animation/test/chrome/test_running_on_compositor.html b/dom/animation/test/chrome/test_running_on_compositor.html index 75ddc9f52417..1a3c60a457a3 100644 --- a/dom/animation/test/chrome/test_running_on_compositor.html +++ b/dom/animation/test/chrome/test_running_on_compositor.html @@ -1429,20 +1429,20 @@ promise_test(async t => { await waitForAnimationReadyToRestyle(animation3); await waitForPaints(); - assert_animation_is_running_on_compositor(animation1, - 'rotate animation in the 3d rendering context should be running on ' + - 'the compositor even if one of its inner frames is too large'); + assert_animation_is_not_running_on_compositor(animation1, + 'rotate animation in the 3d rendering context should not be running on ' + + 'the compositor because one of its inner frames is too large'); assert_animation_is_running_on_compositor(animation2, 'rotate animation in the 3d rendering context is still running on ' + 'the compositor because its display item is created earlier'); - assert_animation_is_running_on_compositor(animation3, - 'rotate animation in the 3d rendering context should be running on ' + - 'the compositor even if one of its parent frames is too large'); + assert_animation_is_not_running_on_compositor(animation3, + 'rotate animation in the 3d rendering context should not be running on ' + + 'the compositor because one of its parent frames is too large'); innerBText.remove(); -}, 'Transform-like animations in the 3d rendering context should run on ' + - 'the compositor even if it is the ancestor of ones whose frames are too ' + - 'large or its ancestor is not allowed to run on the compositor'); +}, 'Transform-like animations in the 3d rendering context should not runs on ' + + 'the compositor if it is the ancestor of ones whose frames are too large ' + + 'or its ancestor is not allowed to run on the compositor'); promise_test(async t => { const container = addDiv(t, { style: 'transform-style: preserve-3d;' }); @@ -1472,19 +1472,19 @@ promise_test(async t => { await waitForAnimationReadyToRestyle(animation3); await waitForPaints(); - assert_animation_is_running_on_compositor(animation1, - 'rotate animation in the 3d rendering context should be running on ' + - 'the compositor even if one of its inner frames is too large'); - assert_animation_is_running_on_compositor(animation2, + assert_animation_is_not_running_on_compositor(animation1, 'rotate animation in the 3d rendering context should not be running on ' + - 'the compositor even if its frame size is too large'); - assert_animation_is_running_on_compositor(animation3, + 'the compositor because one of its inner frames is too large'); + assert_animation_is_not_running_on_compositor(animation2, 'rotate animation in the 3d rendering context should not be running on ' + - 'the compositor even if its previous sibling frame is too large'); + 'the compositor because its frame size is too large'); + assert_animation_is_not_running_on_compositor(animation3, + 'rotate animation in the 3d rendering context should not be running on ' + + 'the compositor because its previous sibling frame is too large'); innerAText.remove(); -}, 'Transform-like animations in the 3d rendering context should run on ' + - 'the compositor even if its previous sibling frame size is too large'); +}, 'Transform-like animations in the 3d rendering context should not runs on ' + + 'the compositor if its previous sibling frame size is too large'); diff --git a/modules/libpref/init/StaticPrefList.yaml b/modules/libpref/init/StaticPrefList.yaml index e2a0cf89c4ee..9f685fcbeb25 100644 --- a/modules/libpref/init/StaticPrefList.yaml +++ b/modules/libpref/init/StaticPrefList.yaml @@ -5649,14 +5649,9 @@ # One of several prefs affecting the maximum area to pre-render when animating # a large element on the compositor. -# This pref enables transform (and transform like properties) animations on a -# large element run on the compositor with rendering partial area of the -# element on the main thread instead of rendering the whole area. Once the -# animation tried to composite out of the partial rendered area, the animation -# is rendered again with the latest visible partial area. - name: layout.animation.prerender.partial type: RelaxedAtomicBool - value: @IS_NIGHTLY_BUILD@ + value: false mirror: always # One of several prefs affecting the maximum area to pre-render when animating