From 0e05920f93383cc777ba4d356059fcf2551b3b51 Mon Sep 17 00:00:00 2001 From: Cristina Horotan Date: Thu, 26 Sep 2024 13:48:33 +0300 Subject: [PATCH] Backed out 2 changesets (bug 1917602) on request by emilio. CLOSED TREE Backed out changeset d5d237db3e73 (bug 1917602) Backed out changeset f3cc65f111ef (bug 1917602) --- .../test/test_transitions_per_property.html | 6 ++++++ .../style/properties/longhands/box.mako.rs | 1 - .../css-viewport/zoom/discrete-animation.html | 17 ----------------- 3 files changed, 6 insertions(+), 18 deletions(-) delete mode 100644 testing/web-platform/tests/css/css-viewport/zoom/discrete-animation.html diff --git a/layout/style/test/test_transitions_per_property.html b/layout/style/test/test_transitions_per_property.html index d8a6d7d23499..836d7f476da6 100644 --- a/layout/style/test/test_transitions_per_property.html +++ b/layout/style/test/test_transitions_per_property.html @@ -371,6 +371,12 @@ if (IsCSSPropertyPrefEnabled("layout.css.contain-intrinsic-size.enabled")) { supported_properties["content-visibility"] = [test_content_visibility_transition]; +if (IsCSSPropertyPrefEnabled("layout.css.zoom.enabled")) { + Object.assign(supported_properties, { + "zoom": [ test_number_transition, test_percent_transition ], + }); +} + // For properties which are well-tested by web-platform-tests, we don't need to // test animations/transitions again on them. var skipped_transitionable_properties = [ diff --git a/servo/components/style/properties/longhands/box.mako.rs b/servo/components/style/properties/longhands/box.mako.rs index 28b1ac2d25ec..05c598bb703b 100644 --- a/servo/components/style/properties/longhands/box.mako.rs +++ b/servo/components/style/properties/longhands/box.mako.rs @@ -631,7 +631,6 @@ ${helpers.predefined_type( "zoom", "Zoom", "computed::box_::Zoom::ONE", - animation_type="discrete", engines="gecko", spec="Non-standard (https://github.com/atanassov/css-zoom/ is the closest)", gecko_pref="layout.css.zoom.enabled", diff --git a/testing/web-platform/tests/css/css-viewport/zoom/discrete-animation.html b/testing/web-platform/tests/css/css-viewport/zoom/discrete-animation.html deleted file mode 100644 index e3a714963c41..000000000000 --- a/testing/web-platform/tests/css/css-viewport/zoom/discrete-animation.html +++ /dev/null @@ -1,17 +0,0 @@ - - -CSS Zoom: animation and transition tests - - - - - - - - \ No newline at end of file