Diff
Modified: trunk/LayoutTests/ChangeLog (204051 => 204052)
--- trunk/LayoutTests/ChangeLog 2016-08-02 23:29:02 UTC (rev 204051)
+++ trunk/LayoutTests/ChangeLog 2016-08-02 23:43:30 UTC (rev 204052)
@@ -1,3 +1,28 @@
+2016-08-02 Dean Jackson <d...@apple.com>
+
+ Reapply fixes for webkit.org/b/159450 and webkit.org/b/157569
+ https://bugs.webkit.org/show_bug.cgi?id=160474
+ <rdar://problem/27668170>
+
+ Reviewed by Simon Fraser.
+
+ The fixes are behaviour we want. They just caused a regression
+ on medium.com (reverted in http://trac.webkit.org/r203380).
+
+ Now that we've branched, revert the reversion (which itself
+ was a reversion), so we can fix the actual bug:
+ https://bugs.webkit.org/show_bug.cgi?id=160478
+
+ * animations/fill-mode-forwards-zero-duration.html:
+ * animations/play-state-start-paused.html:
+ * animations/script-tests/spring-parsing.js:
+ (testSpring):
+ * animations/spring-parsing-expected.txt:
+ * animations/unprefixed-properties-expected.txt:
+ * animations/unprefixed-properties.html:
+ * fast/css/prefixed-unprefixed-variant-style-declaration-expected.txt:
+ * fast/css/shorthand-omitted-initial-value-overrides-shorthand-expected.txt:
+
2016-08-02 Eric Carlson <eric.carl...@apple.com>
Cleanup HTMLMediaElement track lists.
Modified: trunk/LayoutTests/animations/fill-mode-forwards-zero-duration.html (204051 => 204052)
--- trunk/LayoutTests/animations/fill-mode-forwards-zero-duration.html 2016-08-02 23:29:02 UTC (rev 204051)
+++ trunk/LayoutTests/animations/fill-mode-forwards-zero-duration.html 2016-08-02 23:43:30 UTC (rev 204052)
@@ -9,8 +9,7 @@
height: 100px;
width: 100px;
background-color: blue;
- animation-fill-mode: forwards;
- animation: anim1 0 2s linear;
+ animation: anim1 0 2s linear forwards;
}
@keyframes anim1 {
from { left: 400px; }
Modified: trunk/LayoutTests/animations/play-state-start-paused.html (204051 => 204052)
--- trunk/LayoutTests/animations/play-state-start-paused.html 2016-08-02 23:29:02 UTC (rev 204051)
+++ trunk/LayoutTests/animations/play-state-start-paused.html 2016-08-02 23:43:30 UTC (rev 204052)
@@ -13,8 +13,6 @@
width: 100px;
height: 100px;
background-color: green;
- animation-delay: -0.5s;
- animation-play-state: paused;
}
/* For manual testing. */
@@ -23,11 +21,11 @@
}
.mover {
- animation: move 1s linear;
+ animation: move 1s linear -0.5s paused;
}
.slider {
- animation: slide 1s linear;
+ animation: slide 1s linear -0.5s paused;
}
@keyframes move {
Modified: trunk/LayoutTests/animations/script-tests/spring-parsing.js (204051 => 204052)
--- trunk/LayoutTests/animations/script-tests/spring-parsing.js 2016-08-02 23:29:02 UTC (rev 204051)
+++ trunk/LayoutTests/animations/script-tests/spring-parsing.js 2016-08-02 23:43:30 UTC (rev 204052)
@@ -29,7 +29,7 @@
return;
}
- shouldBe("declaration.length", "2");
+ shouldBe("declaration.length", "1");
shouldBe("declaration.getPropertyValue('transition-timing-function')", "'" + expectedValue + "'");
propertyValue = declaration.getPropertyCSSValue("transition-timing-function");
Modified: trunk/LayoutTests/animations/spring-parsing-expected.txt (204051 => 204052)
--- trunk/LayoutTests/animations/spring-parsing-expected.txt 2016-08-02 23:29:02 UTC (rev 204051)
+++ trunk/LayoutTests/animations/spring-parsing-expected.txt 2016-08-02 23:43:30 UTC (rev 204052)
@@ -9,37 +9,37 @@
Basic : spring(1 100 10 0)
PASS cssRule.type is 1
-PASS declaration.length is 2
+PASS declaration.length is 1
PASS declaration.getPropertyValue('transition-timing-function') is 'spring(1 100 10 0)'
PASS propertyValue.cssText is 'spring(1 100 10 0)'
Negative Velocity : spring(1 100 10 -10)
PASS cssRule.type is 1
-PASS declaration.length is 2
+PASS declaration.length is 1
PASS declaration.getPropertyValue('transition-timing-function') is 'spring(1 100 10 -10)'
PASS propertyValue.cssText is 'spring(1 100 10 -10)'
Positive Velocity : spring(1 100 10 10)
PASS cssRule.type is 1
-PASS declaration.length is 2
+PASS declaration.length is 1
PASS declaration.getPropertyValue('transition-timing-function') is 'spring(1 100 10 10)'
PASS propertyValue.cssText is 'spring(1 100 10 10)'
Zero Damping : spring(1 100 0 10)
PASS cssRule.type is 1
-PASS declaration.length is 2
+PASS declaration.length is 1
PASS declaration.getPropertyValue('transition-timing-function') is 'spring(1 100 0 10)'
PASS propertyValue.cssText is 'spring(1 100 0 10)'
Minimum Values : spring(1 1 0 -999999)
PASS cssRule.type is 1
-PASS declaration.length is 2
+PASS declaration.length is 1
PASS declaration.getPropertyValue('transition-timing-function') is 'spring(1 1 0 -999999)'
PASS propertyValue.cssText is 'spring(1 1 0 -999999)'
Floating Point Values : spring(1.5 2.3 3.7 -1.8)
PASS cssRule.type is 1
-PASS declaration.length is 2
+PASS declaration.length is 1
PASS declaration.getPropertyValue('transition-timing-function') is 'spring(1.5 2.3 3.7 -1.8)'
PASS propertyValue.cssText is 'spring(1.5 2.3 3.7 -1.8)'
Modified: trunk/LayoutTests/animations/unprefixed-properties-expected.txt (204051 => 204052)
--- trunk/LayoutTests/animations/unprefixed-properties-expected.txt 2016-08-02 23:29:02 UTC (rev 204051)
+++ trunk/LayoutTests/animations/unprefixed-properties-expected.txt 2016-08-02 23:43:30 UTC (rev 204052)
@@ -6,13 +6,13 @@
Parsing - Basic animation-name : waldo
PASS cssRule.type is 1
-PASS declaration.length is 2
+PASS declaration.length is 1
PASS declaration.getPropertyValue('animation-name') is 'waldo'
PASS declaration.getPropertyValue('-webkit-animation-name') is 'waldo'
Parsing - Multiple animation-names : waldo, wally
PASS cssRule.type is 1
-PASS declaration.length is 2
+PASS declaration.length is 1
PASS declaration.getPropertyValue('animation-name') is 'waldo, wally'
PASS declaration.getPropertyValue('-webkit-animation-name') is 'waldo, wally'
PASS subRule.cssText is 'waldo'
@@ -20,13 +20,13 @@
Parsing - Basic animation-duration : 5s
PASS cssRule.type is 1
-PASS declaration.length is 2
+PASS declaration.length is 1
PASS declaration.getPropertyValue('animation-duration') is '5s'
PASS declaration.getPropertyValue('-webkit-animation-duration') is '5s'
Parsing - Multiple animation-durations : 10s, 20ms
PASS cssRule.type is 1
-PASS declaration.length is 2
+PASS declaration.length is 1
PASS declaration.getPropertyValue('animation-duration') is '10s, 20ms'
PASS declaration.getPropertyValue('-webkit-animation-duration') is '10s, 20ms'
PASS subRule.cssText is '10s'
@@ -34,13 +34,13 @@
Parsing - Basic animation-delay : 5s
PASS cssRule.type is 1
-PASS declaration.length is 2
+PASS declaration.length is 1
PASS declaration.getPropertyValue('animation-delay') is '5s'
PASS declaration.getPropertyValue('-webkit-animation-delay') is '5s'
Parsing - Multiple animation-delays : 10s, 20ms
PASS cssRule.type is 1
-PASS declaration.length is 2
+PASS declaration.length is 1
PASS declaration.getPropertyValue('animation-delay') is '10s, 20ms'
PASS declaration.getPropertyValue('-webkit-animation-delay') is '10s, 20ms'
PASS subRule.cssText is '10s'
@@ -48,19 +48,19 @@
Parsing - Basic animation-timing-function : ease-in-out
PASS cssRule.type is 1
-PASS declaration.length is 2
+PASS declaration.length is 1
PASS declaration.getPropertyValue('animation-timing-function') is 'ease-in-out'
PASS declaration.getPropertyValue('-webkit-animation-timing-function') is 'ease-in-out'
Parsing - animation-timing-function with bezier : cubic-bezier(0.2, 0.3, 0.4, 0.5)
PASS cssRule.type is 1
-PASS declaration.length is 2
+PASS declaration.length is 1
PASS declaration.getPropertyValue('animation-timing-function') is 'cubic-bezier(0.2, 0.3, 0.4, 0.5)'
PASS declaration.getPropertyValue('-webkit-animation-timing-function') is 'cubic-bezier(0.2, 0.3, 0.4, 0.5)'
Parsing - Multiple animation-timing-functions : ease-in, ease-out
PASS cssRule.type is 1
-PASS declaration.length is 2
+PASS declaration.length is 1
PASS declaration.getPropertyValue('animation-timing-function') is 'ease-in, ease-out'
PASS declaration.getPropertyValue('-webkit-animation-timing-function') is 'ease-in, ease-out'
PASS subRule.cssText is 'ease-in'
@@ -68,19 +68,19 @@
Parsing - Basic animation-iteration-count : 4
PASS cssRule.type is 1
-PASS declaration.length is 2
+PASS declaration.length is 1
PASS declaration.getPropertyValue('animation-iteration-count') is '4'
PASS declaration.getPropertyValue('-webkit-animation-iteration-count') is '4'
Parsing - animation-iteration-count with keyword : infinite
PASS cssRule.type is 1
-PASS declaration.length is 2
+PASS declaration.length is 1
PASS declaration.getPropertyValue('animation-iteration-count') is 'infinite'
PASS declaration.getPropertyValue('-webkit-animation-iteration-count') is 'infinite'
Parsing - Multiple animation-iteration-counts : 2, infinite, 4
PASS cssRule.type is 1
-PASS declaration.length is 2
+PASS declaration.length is 1
PASS declaration.getPropertyValue('animation-iteration-count') is '2, infinite, 4'
PASS declaration.getPropertyValue('-webkit-animation-iteration-count') is '2, infinite, 4'
PASS subRule.cssText is '2'
@@ -89,31 +89,31 @@
Parsing - Normal animation-direction : normal
PASS cssRule.type is 1
-PASS declaration.length is 2
+PASS declaration.length is 1
PASS declaration.getPropertyValue('animation-direction') is 'normal'
PASS declaration.getPropertyValue('-webkit-animation-direction') is 'normal'
Parsing - Alternate animation-direction : alternate
PASS cssRule.type is 1
-PASS declaration.length is 2
+PASS declaration.length is 1
PASS declaration.getPropertyValue('animation-direction') is 'alternate'
PASS declaration.getPropertyValue('-webkit-animation-direction') is 'alternate'
Parsing - Reverse animation-direction : reverse
PASS cssRule.type is 1
-PASS declaration.length is 2
+PASS declaration.length is 1
PASS declaration.getPropertyValue('animation-direction') is 'reverse'
PASS declaration.getPropertyValue('-webkit-animation-direction') is 'reverse'
Parsing - Alternate Reverse animation-direction : alternate-reverse
PASS cssRule.type is 1
-PASS declaration.length is 2
+PASS declaration.length is 1
PASS declaration.getPropertyValue('animation-direction') is 'alternate-reverse'
PASS declaration.getPropertyValue('-webkit-animation-direction') is 'alternate-reverse'
Parsing - Multiple animation-directions : alternate, alternate, normal
PASS cssRule.type is 1
-PASS declaration.length is 2
+PASS declaration.length is 1
PASS declaration.getPropertyValue('animation-direction') is 'alternate, alternate, normal'
PASS declaration.getPropertyValue('-webkit-animation-direction') is 'alternate, alternate, normal'
PASS subRule.cssText is 'alternate'
@@ -122,31 +122,31 @@
Parsing - None animation-fill-mode : none
PASS cssRule.type is 1
-PASS declaration.length is 2
+PASS declaration.length is 1
PASS declaration.getPropertyValue('animation-fill-mode') is 'none'
PASS declaration.getPropertyValue('-webkit-animation-fill-mode') is 'none'
Parsing - Forwards animation-fill-mode : forwards
PASS cssRule.type is 1
-PASS declaration.length is 2
+PASS declaration.length is 1
PASS declaration.getPropertyValue('animation-fill-mode') is 'forwards'
PASS declaration.getPropertyValue('-webkit-animation-fill-mode') is 'forwards'
Parsing - Backwards animation-fill-mode : backwards
PASS cssRule.type is 1
-PASS declaration.length is 2
+PASS declaration.length is 1
PASS declaration.getPropertyValue('animation-fill-mode') is 'backwards'
PASS declaration.getPropertyValue('-webkit-animation-fill-mode') is 'backwards'
Parsing - Both animation-fill-mode : both
PASS cssRule.type is 1
-PASS declaration.length is 2
+PASS declaration.length is 1
PASS declaration.getPropertyValue('animation-fill-mode') is 'both'
PASS declaration.getPropertyValue('-webkit-animation-fill-mode') is 'both'
Parsing - Multiple animation-fill-modes : none, forwards, backwards, both
PASS cssRule.type is 1
-PASS declaration.length is 2
+PASS declaration.length is 1
PASS declaration.getPropertyValue('animation-fill-mode') is 'none, forwards, backwards, both'
PASS declaration.getPropertyValue('-webkit-animation-fill-mode') is 'none, forwards, backwards, both'
PASS subRule.cssText is 'none'
Modified: trunk/LayoutTests/animations/unprefixed-properties.html (204051 => 204052)
--- trunk/LayoutTests/animations/unprefixed-properties.html 2016-08-02 23:29:02 UTC (rev 204051)
+++ trunk/LayoutTests/animations/unprefixed-properties.html 2016-08-02 23:43:30 UTC (rev 204052)
@@ -27,7 +27,7 @@
shouldBe("cssRule.type", "1");
declaration = cssRule.style;
- shouldBe("declaration.length", "2"); // We set both the prefixed and unprefixed version.
+ shouldBe("declaration.length", "1");
shouldBe("declaration.getPropertyValue('" + property + "')", "'" + value + "'");
shouldBe("declaration.getPropertyValue('-webkit-" + property + "')", "'" + value + "'");
Modified: trunk/LayoutTests/fast/css/prefixed-unprefixed-variant-style-declaration-expected.txt (204051 => 204052)
--- trunk/LayoutTests/fast/css/prefixed-unprefixed-variant-style-declaration-expected.txt 2016-08-02 23:29:02 UTC (rev 204051)
+++ trunk/LayoutTests/fast/css/prefixed-unprefixed-variant-style-declaration-expected.txt 2016-08-02 23:43:30 UTC (rev 204052)
@@ -16,7 +16,7 @@
PASS getComputedStyle(element).getPropertyValue("-webkit-transition-property")
PASS getComputedStyle(element).getPropertyCSSValue("transition-property")
PASS getComputedStyle(element).getPropertyCSSValue("-webkit-transition-property")
-FAIL expected element.style.cssText to be "transition-property: width;" but got "transition-property: width; -webkit-transition-property: width;"
+PASS element.style.cssText
Setting "-webkit-transition-property" to "width"
PASS element.style.transitionProperty
@@ -31,7 +31,7 @@
PASS getComputedStyle(element).getPropertyValue("-webkit-transition-property")
PASS getComputedStyle(element).getPropertyCSSValue("transition-property")
PASS getComputedStyle(element).getPropertyCSSValue("-webkit-transition-property")
-FAIL expected element.style.cssText to be "-webkit-transition-property: width;" but got "-webkit-transition-property: width; transition-property: width;"
+PASS element.style.cssText
Setting "transition-duration" to "1s"
PASS element.style.transitionDuration
@@ -46,7 +46,7 @@
PASS getComputedStyle(element).getPropertyValue("-webkit-transition-duration")
PASS getComputedStyle(element).getPropertyCSSValue("transition-duration")
PASS getComputedStyle(element).getPropertyCSSValue("-webkit-transition-duration")
-FAIL expected element.style.cssText to be "transition-duration: 1s;" but got "transition-duration: 1s; -webkit-transition-duration: 1s;"
+PASS element.style.cssText
Setting "-webkit-transition-duration" to "1s"
PASS element.style.transitionDuration
@@ -61,7 +61,7 @@
PASS getComputedStyle(element).getPropertyValue("-webkit-transition-duration")
PASS getComputedStyle(element).getPropertyCSSValue("transition-duration")
PASS getComputedStyle(element).getPropertyCSSValue("-webkit-transition-duration")
-FAIL expected element.style.cssText to be "-webkit-transition-duration: 1s;" but got "-webkit-transition-duration: 1s; transition-duration: 1s;"
+PASS element.style.cssText
Setting "transition-timing-function" to "linear"
PASS element.style.transitionTimingFunction
@@ -76,7 +76,7 @@
PASS getComputedStyle(element).getPropertyValue("-webkit-transition-timing-function")
PASS getComputedStyle(element).getPropertyCSSValue("transition-timing-function")
PASS getComputedStyle(element).getPropertyCSSValue("-webkit-transition-timing-function")
-FAIL expected element.style.cssText to be "transition-timing-function: linear;" but got "transition-timing-function: linear; -webkit-transition-timing-function: linear;"
+PASS element.style.cssText
Setting "-webkit-transition-timing-function" to "linear"
PASS element.style.transitionTimingFunction
@@ -91,7 +91,7 @@
PASS getComputedStyle(element).getPropertyValue("-webkit-transition-timing-function")
PASS getComputedStyle(element).getPropertyCSSValue("transition-timing-function")
PASS getComputedStyle(element).getPropertyCSSValue("-webkit-transition-timing-function")
-FAIL expected element.style.cssText to be "-webkit-transition-timing-function: linear;" but got "-webkit-transition-timing-function: linear; transition-timing-function: linear;"
+PASS element.style.cssText
Setting "transition-delay" to "0.5s"
PASS element.style.transitionDelay
@@ -106,7 +106,7 @@
PASS getComputedStyle(element).getPropertyValue("-webkit-transition-delay")
PASS getComputedStyle(element).getPropertyCSSValue("transition-delay")
PASS getComputedStyle(element).getPropertyCSSValue("-webkit-transition-delay")
-FAIL expected element.style.cssText to be "transition-delay: 0.5s;" but got "transition-delay: 0.5s; -webkit-transition-delay: 0.5s;"
+PASS element.style.cssText
Setting "-webkit-transition-delay" to "0.5s"
PASS element.style.transitionDelay
@@ -121,7 +121,7 @@
PASS getComputedStyle(element).getPropertyValue("-webkit-transition-delay")
PASS getComputedStyle(element).getPropertyCSSValue("transition-delay")
PASS getComputedStyle(element).getPropertyCSSValue("-webkit-transition-delay")
-FAIL expected element.style.cssText to be "-webkit-transition-delay: 0.5s;" but got "-webkit-transition-delay: 0.5s; transition-delay: 0.5s;"
+PASS element.style.cssText
Setting "animation-name" to "foo"
PASS element.style.animationName
@@ -136,7 +136,7 @@
PASS getComputedStyle(element).getPropertyValue("-webkit-animation-name")
PASS getComputedStyle(element).getPropertyCSSValue("animation-name")
PASS getComputedStyle(element).getPropertyCSSValue("-webkit-animation-name")
-FAIL expected element.style.cssText to be "animation-name: foo;" but got "animation-name: foo; -webkit-animation-name: foo;"
+PASS element.style.cssText
Setting "-webkit-animation-name" to "foo"
PASS element.style.animationName
@@ -151,7 +151,7 @@
PASS getComputedStyle(element).getPropertyValue("-webkit-animation-name")
PASS getComputedStyle(element).getPropertyCSSValue("animation-name")
PASS getComputedStyle(element).getPropertyCSSValue("-webkit-animation-name")
-FAIL expected element.style.cssText to be "-webkit-animation-name: foo;" but got "-webkit-animation-name: foo; animation-name: foo;"
+PASS element.style.cssText
Setting "animation-duration" to "1s"
PASS element.style.animationDuration
@@ -166,7 +166,7 @@
PASS getComputedStyle(element).getPropertyValue("-webkit-animation-duration")
PASS getComputedStyle(element).getPropertyCSSValue("animation-duration")
PASS getComputedStyle(element).getPropertyCSSValue("-webkit-animation-duration")
-FAIL expected element.style.cssText to be "animation-duration: 1s;" but got "animation-duration: 1s; -webkit-animation-duration: 1s;"
+PASS element.style.cssText
Setting "-webkit-animation-duration" to "1s"
PASS element.style.animationDuration
@@ -181,7 +181,7 @@
PASS getComputedStyle(element).getPropertyValue("-webkit-animation-duration")
PASS getComputedStyle(element).getPropertyCSSValue("animation-duration")
PASS getComputedStyle(element).getPropertyCSSValue("-webkit-animation-duration")
-FAIL expected element.style.cssText to be "-webkit-animation-duration: 1s;" but got "-webkit-animation-duration: 1s; animation-duration: 1s;"
+PASS element.style.cssText
Setting "animation-timing-function" to "linear"
PASS element.style.animationTimingFunction
@@ -196,7 +196,7 @@
PASS getComputedStyle(element).getPropertyValue("-webkit-animation-timing-function")
PASS getComputedStyle(element).getPropertyCSSValue("animation-timing-function")
PASS getComputedStyle(element).getPropertyCSSValue("-webkit-animation-timing-function")
-FAIL expected element.style.cssText to be "animation-timing-function: linear;" but got "animation-timing-function: linear; -webkit-animation-timing-function: linear;"
+PASS element.style.cssText
Setting "-webkit-animation-timing-function" to "linear"
PASS element.style.animationTimingFunction
@@ -211,7 +211,7 @@
PASS getComputedStyle(element).getPropertyValue("-webkit-animation-timing-function")
PASS getComputedStyle(element).getPropertyCSSValue("animation-timing-function")
PASS getComputedStyle(element).getPropertyCSSValue("-webkit-animation-timing-function")
-FAIL expected element.style.cssText to be "-webkit-animation-timing-function: linear;" but got "-webkit-animation-timing-function: linear; animation-timing-function: linear;"
+PASS element.style.cssText
Setting "animation-iteration-count" to "5"
PASS element.style.animationIterationCount
@@ -226,7 +226,7 @@
PASS getComputedStyle(element).getPropertyValue("-webkit-animation-iteration-count")
PASS getComputedStyle(element).getPropertyCSSValue("animation-iteration-count")
PASS getComputedStyle(element).getPropertyCSSValue("-webkit-animation-iteration-count")
-FAIL expected element.style.cssText to be "animation-iteration-count: 5;" but got "animation-iteration-count: 5; -webkit-animation-iteration-count: 5;"
+PASS element.style.cssText
Setting "-webkit-animation-iteration-count" to "5"
PASS element.style.animationIterationCount
@@ -241,7 +241,7 @@
PASS getComputedStyle(element).getPropertyValue("-webkit-animation-iteration-count")
PASS getComputedStyle(element).getPropertyCSSValue("animation-iteration-count")
PASS getComputedStyle(element).getPropertyCSSValue("-webkit-animation-iteration-count")
-FAIL expected element.style.cssText to be "-webkit-animation-iteration-count: 5;" but got "-webkit-animation-iteration-count: 5; animation-iteration-count: 5;"
+PASS element.style.cssText
Setting "animation-direction" to "reverse"
PASS element.style.animationDirection
@@ -256,7 +256,7 @@
PASS getComputedStyle(element).getPropertyValue("-webkit-animation-direction")
PASS getComputedStyle(element).getPropertyCSSValue("animation-direction")
PASS getComputedStyle(element).getPropertyCSSValue("-webkit-animation-direction")
-FAIL expected element.style.cssText to be "animation-direction: reverse;" but got "animation-direction: reverse; -webkit-animation-direction: reverse;"
+PASS element.style.cssText
Setting "-webkit-animation-direction" to "reverse"
PASS element.style.animationDirection
@@ -271,7 +271,7 @@
PASS getComputedStyle(element).getPropertyValue("-webkit-animation-direction")
PASS getComputedStyle(element).getPropertyCSSValue("animation-direction")
PASS getComputedStyle(element).getPropertyCSSValue("-webkit-animation-direction")
-FAIL expected element.style.cssText to be "-webkit-animation-direction: reverse;" but got "-webkit-animation-direction: reverse; animation-direction: reverse;"
+PASS element.style.cssText
Setting "animation-play-state" to "paused"
PASS element.style.animationPlayState
@@ -286,7 +286,7 @@
PASS getComputedStyle(element).getPropertyValue("-webkit-animation-play-state")
PASS getComputedStyle(element).getPropertyCSSValue("animation-play-state")
PASS getComputedStyle(element).getPropertyCSSValue("-webkit-animation-play-state")
-FAIL expected element.style.cssText to be "animation-play-state: paused;" but got "animation-play-state: paused; -webkit-animation-play-state: paused;"
+PASS element.style.cssText
Setting "-webkit-animation-play-state" to "paused"
PASS element.style.animationPlayState
@@ -301,7 +301,7 @@
PASS getComputedStyle(element).getPropertyValue("-webkit-animation-play-state")
PASS getComputedStyle(element).getPropertyCSSValue("animation-play-state")
PASS getComputedStyle(element).getPropertyCSSValue("-webkit-animation-play-state")
-FAIL expected element.style.cssText to be "-webkit-animation-play-state: paused;" but got "-webkit-animation-play-state: paused; animation-play-state: paused;"
+PASS element.style.cssText
Setting "animation-delay" to "0.5s"
PASS element.style.animationDelay
@@ -316,7 +316,7 @@
PASS getComputedStyle(element).getPropertyValue("-webkit-animation-delay")
PASS getComputedStyle(element).getPropertyCSSValue("animation-delay")
PASS getComputedStyle(element).getPropertyCSSValue("-webkit-animation-delay")
-FAIL expected element.style.cssText to be "animation-delay: 0.5s;" but got "animation-delay: 0.5s; -webkit-animation-delay: 0.5s;"
+PASS element.style.cssText
Setting "-webkit-animation-delay" to "0.5s"
PASS element.style.animationDelay
@@ -331,7 +331,7 @@
PASS getComputedStyle(element).getPropertyValue("-webkit-animation-delay")
PASS getComputedStyle(element).getPropertyCSSValue("animation-delay")
PASS getComputedStyle(element).getPropertyCSSValue("-webkit-animation-delay")
-FAIL expected element.style.cssText to be "-webkit-animation-delay: 0.5s;" but got "-webkit-animation-delay: 0.5s; animation-delay: 0.5s;"
+PASS element.style.cssText
Setting "animation-fill-mode" to "forwards"
PASS element.style.animationFillMode
@@ -346,7 +346,7 @@
PASS getComputedStyle(element).getPropertyValue("-webkit-animation-fill-mode")
PASS getComputedStyle(element).getPropertyCSSValue("animation-fill-mode")
PASS getComputedStyle(element).getPropertyCSSValue("-webkit-animation-fill-mode")
-FAIL expected element.style.cssText to be "animation-fill-mode: forwards;" but got "animation-fill-mode: forwards; -webkit-animation-fill-mode: forwards;"
+PASS element.style.cssText
Setting "-webkit-animation-fill-mode" to "forwards"
PASS element.style.animationFillMode
@@ -361,7 +361,7 @@
PASS getComputedStyle(element).getPropertyValue("-webkit-animation-fill-mode")
PASS getComputedStyle(element).getPropertyCSSValue("animation-fill-mode")
PASS getComputedStyle(element).getPropertyCSSValue("-webkit-animation-fill-mode")
-FAIL expected element.style.cssText to be "-webkit-animation-fill-mode: forwards;" but got "-webkit-animation-fill-mode: forwards; animation-fill-mode: forwards;"
+PASS element.style.cssText
PASS successfullyParsed is true
Modified: trunk/LayoutTests/fast/css/shorthand-omitted-initial-value-overrides-shorthand-expected.txt (204051 => 204052)
--- trunk/LayoutTests/fast/css/shorthand-omitted-initial-value-overrides-shorthand-expected.txt 2016-08-02 23:29:02 UTC (rev 204051)
+++ trunk/LayoutTests/fast/css/shorthand-omitted-initial-value-overrides-shorthand-expected.txt 2016-08-02 23:43:30 UTC (rev 204052)
@@ -16,20 +16,20 @@
PASS transition-property
Animation properties
-FAIL expected that setting "animation-name: foo; animation: 1s;" would compute animation-name to "none" but got "foo"
-FAIL expected that setting "animation-duration: 1s; animation: none;" would compute animation-duration to "0s" but got "1s"
-FAIL expected that setting "animation-timing-function: linear; animation: none;" would compute animation-timing-function to "ease" but got "linear"
-FAIL expected that setting "animation-iteration-count: 5; animation: none;" would compute animation-iteration-count to "1" but got "5"
-FAIL expected that setting "animation-direction: reverse; animation: none;" would compute animation-direction to "normal" but got "reverse"
-FAIL expected that setting "animation-play-state: paused; animation: none;" would compute animation-play-state to "running" but got "paused"
-FAIL expected that setting "animation-delay: 1s; animation: none;" would compute animation-delay to "0s" but got "1s"
-FAIL expected that setting "animation-fill-mode: forwards; animation: none;" would compute animation-fill-mode to "none" but got "forwards"
+PASS animation-name
+PASS animation-duration
+PASS animation-timing-function
+PASS animation-iteration-count
+PASS animation-direction
+PASS animation-play-state
+PASS animation-delay
+PASS animation-fill-mode
Prefixed animation properties
PASS -webkit-animation-name
-FAIL expected that setting "-webkit-animation-name: foo; animation: none;" would compute animation-name to "none" but got "foo"
+PASS animation-name
PASS -webkit-animation-name
-FAIL expected that setting "animation-name: foo; animation: none;" would compute animation-name to "none" but got "foo"
+PASS animation-name
PASS successfullyParsed is true
Modified: trunk/Source/WebCore/ChangeLog (204051 => 204052)
--- trunk/Source/WebCore/ChangeLog 2016-08-02 23:29:02 UTC (rev 204051)
+++ trunk/Source/WebCore/ChangeLog 2016-08-02 23:43:30 UTC (rev 204052)
@@ -1,3 +1,40 @@
+2016-08-02 Dean Jackson <d...@apple.com>
+
+ Reapply fixes for webkit.org/b/159450 and webkit.org/b/157569
+ https://bugs.webkit.org/show_bug.cgi?id=160474
+ <rdar://problem/27668170>
+
+ Reviewed by Simon Fraser.
+
+ The fixes are behaviour we want. They just caused a regression
+ on medium.com (reverted in http://trac.webkit.org/r203380).
+
+ Now that we've branched, revert the reversion (which itself
+ was a reversion), so we can fix the actual bug:
+ https://bugs.webkit.org/show_bug.cgi?id=160478
+
+ * css/CSSParser.cpp:
+ (WebCore::CSSParser::parseValue):
+ (WebCore::CSSParser::parseAnimationShorthand):
+ (WebCore::CSSParser::addPropertyWithPrefixingVariant):
+ (WebCore::CSSParser::parseTransitionShorthand):
+ * css/CSSPropertyNames.in:
+ * css/PropertySetCSSStyleDeclaration.cpp:
+ (WebCore::PropertySetCSSStyleDeclaration::getPropertyCSSValue):
+ (WebCore::PropertySetCSSStyleDeclaration::getPropertyValue):
+ (WebCore::PropertySetCSSStyleDeclaration::getPropertyCSSValueInternal):
+ (WebCore::PropertySetCSSStyleDeclaration::getPropertyValueInternal):
+ * css/StyleProperties.cpp:
+ (WebCore::MutableStyleProperties::removeShorthandProperty):
+ (WebCore::StyleProperties::asText):
+ (WebCore::MutableStyleProperties::removeProperty): Deleted.
+ (WebCore::MutableStyleProperties::removePrefixedOrUnprefixedProperty): Deleted.
+ (WebCore::MutableStyleProperties::setProperty): Deleted.
+ (WebCore::getIndexInShorthandVectorForPrefixingVariant): Deleted.
+ (WebCore::MutableStyleProperties::appendPrefixingVariantProperty): Deleted.
+ (WebCore::MutableStyleProperties::setPrefixingVariantProperty): Deleted.
+ * css/StyleProperties.h:
+
2016-08-02 Eric Carlson <eric.carl...@apple.com>
Cleanup HTMLMediaElement track lists.
Modified: trunk/Source/WebCore/css/CSSParser.cpp (204051 => 204052)
--- trunk/Source/WebCore/css/CSSParser.cpp 2016-08-02 23:29:02 UTC (rev 204051)
+++ trunk/Source/WebCore/css/CSSParser.cpp 2016-08-02 23:43:30 UTC (rev 204052)
@@ -1605,23 +1605,6 @@
return ImmutableStyleProperties::create(results.data(), results.size(), m_context.mode);
}
-void CSSParser::addPropertyWithPrefixingVariant(CSSPropertyID propId, RefPtr<CSSValue>&& value, bool important, bool implicit)
-{
- addProperty(propId, value.copyRef(), important, implicit);
-
- CSSPropertyID prefixingVariant = prefixingVariantForPropertyId(propId);
- if (prefixingVariant == propId)
- return;
-
- if (m_currentShorthand) {
- // We can't use ShorthandScope here as we can already be inside one (e.g we are parsing CSSTransition).
- m_currentShorthand = prefixingVariantForPropertyId(m_currentShorthand);
- addProperty(prefixingVariant, WTFMove(value), important, implicit);
- m_currentShorthand = prefixingVariantForPropertyId(m_currentShorthand);
- } else
- addProperty(prefixingVariant, WTFMove(value), important, implicit);
-}
-
void CSSParser::addProperty(CSSPropertyID propId, RefPtr<CSSValue>&& value, bool important, bool implicit)
{
// This property doesn't belong to a shorthand or is a CSS variable (which will be resolved later).
@@ -2739,7 +2722,7 @@
RefPtr<CSSValue> val;
AnimationParseContext context;
if (parseAnimationProperty(propId, val, context)) {
- addPropertyWithPrefixingVariant(propId, WTFMove(val), important);
+ addProperty(propId, WTFMove(val), important);
return true;
}
return false;
@@ -3833,17 +3816,40 @@
return false;
}
+ // Fill in any remaining properties with the initial value.
for (i = 0; i < numProperties; ++i) {
- // If we didn't find the property, set an intial value.
if (!parsedProperty[i])
addAnimationValue(values[i], cssValuePool.createImplicitInitialValue());
-
- addProperty(shorthand.properties()[i], WTFMove(values[i]), important);
}
+ // Now add all of the properties we found.
+ // In this case we have to explicitly set the variant form as well,
+ // to make sure that a shorthand clears all existing prefixed and
+ // unprefixed values.
+ for (i = 0; i < numProperties; ++i)
+ addPropertyWithPrefixingVariant(shorthand.properties()[i], WTFMove(values[i]), important);
+
return true;
}
+void CSSParser::addPropertyWithPrefixingVariant(CSSPropertyID propId, RefPtr<CSSValue>&& value, bool important, bool implicit)
+{
+ addProperty(propId, value.copyRef(), important, implicit);
+
+ CSSPropertyID prefixingVariant = prefixingVariantForPropertyId(propId);
+ if (prefixingVariant == propId)
+ return;
+
+ if (m_currentShorthand) {
+ // We can't use ShorthandScope here as we can already be inside one (e.g we are parsing CSSTransition).
+ m_currentShorthand = prefixingVariantForPropertyId(m_currentShorthand);
+ addProperty(prefixingVariant, WTFMove(value), important, implicit);
+ m_currentShorthand = prefixingVariantForPropertyId(m_currentShorthand);
+ } else
+ addProperty(prefixingVariant, WTFMove(value), important, implicit);
+}
+
+
RefPtr<CSSPrimitiveValue> CSSParser::parseColumnWidth()
{
ValueWithCalculation valueWithCalculation(*m_valueList->current());
@@ -3971,6 +3977,9 @@
}
// Now add all of the properties we found.
+ // In this case we have to explicitly set the variant form as well,
+ // to make sure that a shorthand clears all existing prefixed and
+ // unprefixed values.
for (i = 0; i < numProperties; ++i)
addPropertyWithPrefixingVariant(shorthand.properties()[i], WTFMove(values[i]), important);
Modified: trunk/Source/WebCore/css/CSSPropertyNames.in (204051 => 204052)
--- trunk/Source/WebCore/css/CSSPropertyNames.in 2016-08-02 23:29:02 UTC (rev 204051)
+++ trunk/Source/WebCore/css/CSSPropertyNames.in 2016-08-02 23:43:30 UTC (rev 204052)
@@ -348,10 +348,10 @@
text-underline-width [SkipBuilder]
top [Initial=initialOffset, Converter=LengthOrAuto]
transition [Longhands=transition-property|transition-duration|transition-timing-function|transition-delay]
-transition-delay [SkipBuilder]
-transition-duration [SkipBuilder]
-transition-property [SkipBuilder]
-transition-timing-function [SkipBuilder]
+transition-delay [AnimationProperty, NameForMethods=Delay]
+transition-duration [AnimationProperty, NameForMethods=Duration]
+transition-property [AnimationProperty, NameForMethods=Property]
+transition-timing-function [AnimationProperty, NameForMethods=TimingFunction]
unicode-bidi
unicode-range [SkipBuilder]
Modified: trunk/Source/WebCore/css/PropertySetCSSStyleDeclaration.cpp (204051 => 204052)
--- trunk/Source/WebCore/css/PropertySetCSSStyleDeclaration.cpp 2016-08-02 23:29:02 UTC (rev 204051)
+++ trunk/Source/WebCore/css/PropertySetCSSStyleDeclaration.cpp 2016-08-02 23:43:30 UTC (rev 204052)
@@ -172,7 +172,7 @@
CSSPropertyID propertyID = cssPropertyID(propertyName);
if (!propertyID)
return nullptr;
- return cloneAndCacheForCSSOM(m_propertySet->getPropertyCSSValue(propertyID).get());
+ return cloneAndCacheForCSSOM(getPropertyCSSValueInternal(propertyID).get());
}
String PropertySetCSSStyleDeclaration::getPropertyValue(const String& propertyName)
@@ -183,7 +183,7 @@
CSSPropertyID propertyID = cssPropertyID(propertyName);
if (!propertyID)
return String();
- return m_propertySet->getPropertyValue(propertyID);
+ return getPropertyValueInternal(propertyID);
}
String PropertySetCSSStyleDeclaration::getPropertyPriority(const String& propertyName)
@@ -267,12 +267,28 @@
RefPtr<CSSValue> PropertySetCSSStyleDeclaration::getPropertyCSSValueInternal(CSSPropertyID propertyID)
{
- return m_propertySet->getPropertyCSSValue(propertyID);
+ RefPtr<CSSValue> value = m_propertySet->getPropertyCSSValue(propertyID);
+ if (value)
+ return value;
+
+ CSSPropertyID prefixingVariant = prefixingVariantForPropertyId(propertyID);
+ if (prefixingVariant != propertyID)
+ return m_propertySet->getPropertyCSSValue(prefixingVariant);
+
+ return nullptr;
}
String PropertySetCSSStyleDeclaration::getPropertyValueInternal(CSSPropertyID propertyID)
-{
- return m_propertySet->getPropertyValue(propertyID);
+{
+ String value = m_propertySet->getPropertyValue(propertyID);
+ if (!value.isEmpty())
+ return value;
+
+ CSSPropertyID prefixingVariant = prefixingVariantForPropertyId(propertyID);
+ if (prefixingVariant != propertyID)
+ return m_propertySet->getPropertyValue(prefixingVariant);
+
+ return String();
}
bool PropertySetCSSStyleDeclaration::setPropertyInternal(CSSPropertyID propertyID, const String& value, bool important, ExceptionCode& ec)
Modified: trunk/Source/WebCore/css/StyleProperties.cpp (204051 => 204052)
--- trunk/Source/WebCore/css/StyleProperties.cpp 2016-08-02 23:29:02 UTC (rev 204051)
+++ trunk/Source/WebCore/css/StyleProperties.cpp 2016-08-02 23:43:30 UTC (rev 204052)
@@ -640,14 +640,15 @@
if (!shorthand.length())
return false;
- bool ret = removePropertiesInSet(shorthand.properties(), shorthand.length());
+ bool propertiesWereRemoved = removePropertiesInSet(shorthand.properties(), shorthand.length());
CSSPropertyID prefixingVariant = prefixingVariantForPropertyId(propertyID);
if (prefixingVariant == propertyID)
- return ret;
+ return propertiesWereRemoved;
StylePropertyShorthand shorthandPrefixingVariant = shorthandForProperty(prefixingVariant);
- return removePropertiesInSet(shorthandPrefixingVariant.properties(), shorthandPrefixingVariant.length());
+ bool prefixedVariantPropertiesWereRemoved = removePropertiesInSet(shorthandPrefixingVariant.properties(), shorthandPrefixingVariant.length());
+ return propertiesWereRemoved || prefixedVariantPropertiesWereRemoved;
}
bool MutableStyleProperties::removeProperty(CSSPropertyID propertyID, String* returnText)
@@ -673,8 +674,6 @@
// and sweeping them when the vector grows too big.
m_propertyVector.remove(foundPropertyIndex);
- removePrefixedOrUnprefixedProperty(propertyID);
-
return true;
}
@@ -697,14 +696,6 @@
return true;
}
-void MutableStyleProperties::removePrefixedOrUnprefixedProperty(CSSPropertyID propertyID)
-{
- int foundPropertyIndex = findPropertyIndex(prefixingVariantForPropertyId(propertyID));
- if (foundPropertyIndex == -1)
- return;
- m_propertyVector.remove(foundPropertyIndex);
-}
-
bool StyleProperties::propertyIsImportant(CSSPropertyID propertyID) const
{
int foundPropertyIndex = findPropertyIndex(propertyID);
@@ -801,42 +792,14 @@
return false;
*toReplace = property;
- setPrefixingVariantProperty(property);
return true;
}
}
- return appendPrefixingVariantProperty(property);
-}
-
-static unsigned getIndexInShorthandVectorForPrefixingVariant(const CSSProperty& property, CSSPropertyID prefixingVariant)
-{
- if (!property.isSetFromShorthand())
- return 0;
-
- CSSPropertyID prefixedShorthand = prefixingVariantForPropertyId(property.shorthandID());
- return indexOfShorthandForLonghand(prefixedShorthand, matchingShorthandsForLonghand(prefixingVariant));
-}
-
-bool MutableStyleProperties::appendPrefixingVariantProperty(const CSSProperty& property)
-{
m_propertyVector.append(property);
- CSSPropertyID prefixingVariant = prefixingVariantForPropertyId(property.id());
- if (prefixingVariant == property.id())
- return true;
-
- m_propertyVector.append(CSSProperty(prefixingVariant, property.value(), property.isImportant(), property.isSetFromShorthand(), getIndexInShorthandVectorForPrefixingVariant(property, prefixingVariant), property.metadata().m_implicit));
return true;
}
-void MutableStyleProperties::setPrefixingVariantProperty(const CSSProperty& property)
-{
- CSSPropertyID prefixingVariant = prefixingVariantForPropertyId(property.id());
- CSSProperty* toReplace = findCSSPropertyWithID(prefixingVariant);
- if (toReplace && prefixingVariant != property.id())
- *toReplace = CSSProperty(prefixingVariant, property.value(), property.isImportant(), property.isSetFromShorthand(), getIndexInShorthandVectorForPrefixingVariant(property, prefixingVariant), property.metadata().m_implicit);
-}
-
bool MutableStyleProperties::setProperty(CSSPropertyID propertyID, CSSValueID identifier, bool important)
{
return setProperty(CSSProperty(propertyID, CSSValuePool::singleton().createIdentifierValue(identifier), important));
@@ -920,6 +883,7 @@
case CSSPropertyAnimationIterationCount:
case CSSPropertyAnimationDirection:
case CSSPropertyAnimationFillMode:
+ case CSSPropertyAnimationPlayState:
shorthandPropertyID = CSSPropertyAnimation;
break;
case CSSPropertyBackgroundPositionX:
@@ -1019,6 +983,7 @@
case CSSPropertyWebkitAnimationIterationCount:
case CSSPropertyWebkitAnimationDirection:
case CSSPropertyWebkitAnimationFillMode:
+ case CSSPropertyWebkitAnimationPlayState:
shorthandPropertyID = CSSPropertyWebkitAnimation;
break;
case CSSPropertyFlexDirection:
Modified: trunk/Source/WebCore/css/StyleProperties.h (204051 => 204052)
--- trunk/Source/WebCore/css/StyleProperties.h 2016-08-02 23:29:02 UTC (rev 204051)
+++ trunk/Source/WebCore/css/StyleProperties.h 2016-08-02 23:43:30 UTC (rev 204052)
@@ -207,12 +207,9 @@
// These do not. FIXME: This is too messy, we can do better.
bool setProperty(CSSPropertyID, CSSValueID identifier, bool important = false);
bool setProperty(CSSPropertyID, CSSPropertyID identifier, bool important = false);
- bool appendPrefixingVariantProperty(const CSSProperty&);
- void setPrefixingVariantProperty(const CSSProperty&);
bool setProperty(const CSSProperty&, CSSProperty* slot = nullptr);
bool removeProperty(CSSPropertyID, String* returnText = nullptr);
- void removePrefixedOrUnprefixedProperty(CSSPropertyID);
void removeBlockProperties();
bool removePropertiesInSet(const CSSPropertyID* set, unsigned length);
