Commit 6b2bcf62 authored by George Steel's avatar George Steel Committed by Commit Bot

Make text-combine-upright not animatable

Update WPT tests to match spec.

Spec: https://drafts.csswg.org/css-writing-modes-4/#text-combine-upright

Bug: 1105144
Change-Id: Ia89fdf3f14bab8dfbce1a9e2315f64e9315423e7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2303353Reviewed-by: default avatarKevin Ellis <kevers@chromium.org>
Commit-Queue: George Steel <gtsteel@chromium.org>
Cr-Commit-Position: refs/heads/master@{#790515}
parent a2db5b9f
...@@ -1795,6 +1795,7 @@ bool CSSAnimations::IsAnimationAffectingProperty(const CSSProperty& property) { ...@@ -1795,6 +1795,7 @@ bool CSSAnimations::IsAnimationAffectingProperty(const CSSProperty& property) {
case CSSPropertyID::kWebkitWritingMode: case CSSPropertyID::kWebkitWritingMode:
case CSSPropertyID::kWillChange: case CSSPropertyID::kWillChange:
case CSSPropertyID::kWritingMode: case CSSPropertyID::kWritingMode:
case CSSPropertyID::kTextCombineUpright:
return true; return true;
default: default:
return false; return false;
......
This is a testharness.js-based test. This is a testharness.js-based test.
Found 60 tests; 53 PASS, 7 FAIL, 0 TIMEOUT, 0 NOTRUN. Found 60 tests; 54 PASS, 6 FAIL, 0 TIMEOUT, 0 NOTRUN.
PASS Animation of font in ::marker PASS Animation of font in ::marker
PASS Animation of font-family in ::marker PASS Animation of font-family in ::marker
PASS Animation of font-feature-settings in ::marker PASS Animation of font-feature-settings in ::marker
...@@ -18,7 +18,7 @@ FAIL Animation of font-variant-position in ::marker assert_true: font-variant-po ...@@ -18,7 +18,7 @@ FAIL Animation of font-variant-position in ::marker assert_true: font-variant-po
PASS Animation of font-weight in ::marker PASS Animation of font-weight in ::marker
FAIL Animation of white-space in ::marker assert_equals: expected "nowrap" but got "pre" FAIL Animation of white-space in ::marker assert_equals: expected "nowrap" but got "pre"
PASS Animation of color in ::marker PASS Animation of color in ::marker
FAIL Animation of text-combine-upright in ::marker assert_equals: expected "none" but got "all" PASS Animation of text-combine-upright in ::marker
PASS Animation of unicode-bidi in ::marker PASS Animation of unicode-bidi in ::marker
PASS Animation of direction in ::marker PASS Animation of direction in ::marker
PASS Animation of content in ::marker PASS Animation of content in ::marker
......
This is a testharness.js-based test. This is a testharness.js-based test.
Found 263 tests; 250 PASS, 13 FAIL, 0 TIMEOUT, 0 NOTRUN. Found 260 tests; 247 PASS, 13 FAIL, 0 TIMEOUT, 0 NOTRUN.
PASS Setup PASS Setup
PASS isolation (type: discrete) has testAccumulation function PASS isolation (type: discrete) has testAccumulation function
PASS isolation: "isolate" onto "auto" PASS isolation: "isolate" onto "auto"
...@@ -173,9 +173,6 @@ PASS text-align-last: "start" onto "end" ...@@ -173,9 +173,6 @@ PASS text-align-last: "start" onto "end"
PASS text-anchor (type: discrete) has testAccumulation function PASS text-anchor (type: discrete) has testAccumulation function
PASS text-anchor: "end" onto "middle" PASS text-anchor: "end" onto "middle"
PASS text-anchor: "middle" onto "end" PASS text-anchor: "middle" onto "end"
PASS text-combine-upright (type: discrete) has testAccumulation function
PASS text-combine-upright: "none" onto "all"
PASS text-combine-upright: "all" onto "none"
PASS text-decoration-color (type: color) has testAccumulation function PASS text-decoration-color (type: color) has testAccumulation function
PASS text-decoration-color supports animating as color of rgb() with overflowed from and to values PASS text-decoration-color supports animating as color of rgb() with overflowed from and to values
PASS text-decoration-color supports animating as color of #RGB PASS text-decoration-color supports animating as color of #RGB
......
This is a testharness.js-based test. This is a testharness.js-based test.
Found 259 tests; 249 PASS, 10 FAIL, 0 TIMEOUT, 0 NOTRUN. Found 256 tests; 246 PASS, 10 FAIL, 0 TIMEOUT, 0 NOTRUN.
PASS Setup PASS Setup
PASS isolation (type: discrete) has testAddition function PASS isolation (type: discrete) has testAddition function
PASS isolation: "isolate" onto "auto" PASS isolation: "isolate" onto "auto"
...@@ -173,9 +173,6 @@ PASS text-align-last: "start" onto "end" ...@@ -173,9 +173,6 @@ PASS text-align-last: "start" onto "end"
PASS text-anchor (type: discrete) has testAddition function PASS text-anchor (type: discrete) has testAddition function
PASS text-anchor: "end" onto "middle" PASS text-anchor: "end" onto "middle"
PASS text-anchor: "middle" onto "end" PASS text-anchor: "middle" onto "end"
PASS text-combine-upright (type: discrete) has testAddition function
PASS text-combine-upright: "none" onto "all"
PASS text-combine-upright: "all" onto "none"
PASS text-decoration-color (type: color) has testAddition function PASS text-decoration-color (type: color) has testAddition function
PASS text-decoration-color supports animating as color of rgb() with overflowed from and to values PASS text-decoration-color supports animating as color of rgb() with overflowed from and to values
PASS text-decoration-color supports animating as color of #RGB PASS text-decoration-color supports animating as color of #RGB
......
This is a testharness.js-based test. This is a testharness.js-based test.
Found 318 tests; 305 PASS, 13 FAIL, 0 TIMEOUT, 0 NOTRUN. Found 314 tests; 301 PASS, 13 FAIL, 0 TIMEOUT, 0 NOTRUN.
PASS Setup PASS Setup
PASS isolation (type: discrete) has testInterpolation function PASS isolation (type: discrete) has testInterpolation function
PASS isolation uses discrete animation when animating between "auto" and "isolate" with linear easing PASS isolation uses discrete animation when animating between "auto" and "isolate" with linear easing
...@@ -208,10 +208,6 @@ PASS text-anchor (type: discrete) has testInterpolation function ...@@ -208,10 +208,6 @@ PASS text-anchor (type: discrete) has testInterpolation function
PASS text-anchor uses discrete animation when animating between "middle" and "end" with linear easing PASS text-anchor uses discrete animation when animating between "middle" and "end" with linear easing
PASS text-anchor uses discrete animation when animating between "middle" and "end" with effect easing PASS text-anchor uses discrete animation when animating between "middle" and "end" with effect easing
PASS text-anchor uses discrete animation when animating between "middle" and "end" with keyframe easing PASS text-anchor uses discrete animation when animating between "middle" and "end" with keyframe easing
PASS text-combine-upright (type: discrete) has testInterpolation function
PASS text-combine-upright uses discrete animation when animating between "all" and "none" with linear easing
PASS text-combine-upright uses discrete animation when animating between "all" and "none" with effect easing
PASS text-combine-upright uses discrete animation when animating between "all" and "none" with keyframe easing
PASS text-decoration-color (type: color) has testInterpolation function PASS text-decoration-color (type: color) has testInterpolation function
PASS text-decoration-color supports animating as color of rgb() PASS text-decoration-color supports animating as color of rgb()
PASS text-decoration-color supports animating as color of #RGB PASS text-decoration-color supports animating as color of #RGB
......
...@@ -1261,12 +1261,6 @@ const gCSSProperties2 = { ...@@ -1261,12 +1261,6 @@ const gCSSProperties2 = {
{ type: 'discrete', options: [ [ 'middle', 'end' ] ] } { type: 'discrete', options: [ [ 'middle', 'end' ] ] }
] ]
}, },
'text-combine-upright': {
// https://drafts.csswg.org/css-writing-modes-3/#propdef-text-combine-upright
types: [
{ type: 'discrete', options: [ [ 'all', 'none' ] ] }
]
},
'text-decoration-color': { 'text-decoration-color': {
// https://drafts.csswg.org/css-text-decor-3/#propdef-text-decoration-color // https://drafts.csswg.org/css-text-decor-3/#propdef-text-decoration-color
types: [ 'color' ] types: [ 'color' ]
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment