Modified: trunk/LayoutTests/transitions/transitions-parsing-expected.txt (144643 => 144644)
--- trunk/LayoutTests/transitions/transitions-parsing-expected.txt 2013-03-04 18:34:15 UTC (rev 144643)
+++ trunk/LayoutTests/transitions/transitions-parsing-expected.txt 2013-03-04 18:49:29 UTC (rev 144644)
@@ -16,6 +16,10 @@
PASS computedStyle.transitionProperty is 'all'
PASS style.webkitTransitionProperty is 'all'
PASS computedStyle.webkitTransitionProperty is 'all'
+PASS style.transitionProperty is 'all, all'
+PASS computedStyle.transitionProperty is 'all'
+PASS style.webkitTransitionProperty is 'all, all'
+PASS computedStyle.webkitTransitionProperty is 'all'
PASS style.transitionProperty is 'background-position'
PASS computedStyle.transitionProperty is 'background-position'
PASS style.webkitTransitionProperty is 'background-position'
@@ -93,10 +97,6 @@
PASS computedStyle.transitionProperty is 'all'
PASS style.webkitTransitionProperty is ''
PASS computedStyle.webkitTransitionProperty is 'all'
-PASS style.transitionProperty is ''
-PASS computedStyle.transitionProperty is 'all'
-PASS style.webkitTransitionProperty is ''
-PASS computedStyle.webkitTransitionProperty is 'all'
Valid transition-duration values.
PASS computedStyle.transitionDuration is '0s'
PASS computedStyle.webkitTransitionDuration is '0s'
@@ -395,6 +395,14 @@
PASS computedStyle.transitionDelay is '10s, 20s'
PASS computedStyle.webkitTransitionDelay is '10s, 20s'
PASS checkTransitionShorthandValue() is true
+PASS style.transition is 'all, all'
+PASS computedStyle.transition is 'all 0s ease 0s'
+PASS style.webkitTransition is 'all, all'
+PASS computedStyle.webkitTransition is 'all 0s ease 0s'
+PASS style.transition is 'all 20s ease-in 10s, all 20s ease-out'
+PASS computedStyle.transition is 'all 20s ease-out 0s'
+PASS style.webkitTransition is 'all 20s ease-in 10s, all 20s ease-out'
+PASS computedStyle.webkitTransition is 'all 20s ease-out 0s'
PASS style.transition is 'opacity 20s ease-in 10s, all 20s ease-out'
PASS computedStyle.transition is 'opacity 20s ease-in 10s, all 20s ease-out 0s'
PASS style.webkitTransition is 'opacity 20s ease-in 10s, all 20s ease-out'
@@ -458,10 +466,6 @@
PASS computedStyle.transition is 'all 0s ease 0s'
PASS style.webkitTransition is ''
PASS computedStyle.webkitTransition is 'all 0s ease 0s'
-PASS style.transition is ''
-PASS computedStyle.transition is 'all 0s ease 0s'
-PASS style.webkitTransition is ''
-PASS computedStyle.webkitTransition is 'all 0s ease 0s'
PASS successfullyParsed is true
TEST COMPLETE
Modified: trunk/LayoutTests/transitions/transitions-parsing.html (144643 => 144644)
--- trunk/LayoutTests/transitions/transitions-parsing.html 2013-03-04 18:34:15 UTC (rev 144643)
+++ trunk/LayoutTests/transitions/transitions-parsing.html 2013-03-04 18:49:29 UTC (rev 144644)
@@ -43,6 +43,12 @@
shouldBe("style.webkitTransitionProperty", "'all'");
shouldBe("computedStyle.webkitTransitionProperty", "'all'");
+style.transitionProperty = "all, all";
+shouldBe("style.transitionProperty", "'all, all'");
+shouldBe("computedStyle.transitionProperty", "'all'");
+shouldBe("style.webkitTransitionProperty", "'all, all'");
+shouldBe("computedStyle.webkitTransitionProperty", "'all'");
+
style.transitionProperty = "background-position";
shouldBe("style.transitionProperty", "'background-position'");
shouldBe("computedStyle.transitionProperty", "'background-position'");
@@ -160,12 +166,6 @@
shouldBe("style.webkitTransitionProperty", "''");
shouldBe("computedStyle.webkitTransitionProperty", "'all'");
-style.transitionProperty = "all, all";
-shouldBe("style.transitionProperty", "''");
-shouldBe("computedStyle.transitionProperty", "'all'");
-shouldBe("style.webkitTransitionProperty", "''");
-shouldBe("computedStyle.webkitTransitionProperty", "'all'");
-
style.transitionProperty = "";
debug("Valid transition-duration values.");
@@ -623,6 +623,18 @@
shouldBe("computedStyle.webkitTransitionDelay", "'10s, 20s'");
shouldBe("checkTransitionShorthandValue()", "true");
+style.transition = "all, all";
+shouldBe("style.transition", "'all, all'");
+shouldBe("computedStyle.transition", "'all 0s ease 0s'");
+shouldBe("style.webkitTransition", "'all, all'");
+shouldBe("computedStyle.webkitTransition", "'all 0s ease 0s'");
+
+style.transition = "all 20s 10s ease-in, all ease-out 20s";
+shouldBe("style.transition", "'all 20s ease-in 10s, all 20s ease-out'");
+shouldBe("computedStyle.transition", "'all 20s ease-out 0s'");
+shouldBe("style.webkitTransition", "'all 20s ease-in 10s, all 20s ease-out'");
+shouldBe("computedStyle.webkitTransition", "'all 20s ease-out 0s'");
+
style.transition = "ease-in opacity 20s 10s, all ease-out 20s";
shouldBe("style.transition", "'opacity 20s ease-in 10s, all 20s ease-out'");
shouldBe("computedStyle.transition", "'opacity 20s ease-in 10s, all 20s ease-out 0s'");
@@ -718,12 +730,6 @@
shouldBe("style.webkitTransition", "''");
shouldBe("computedStyle.webkitTransition", "'all 0s ease 0s'");
-style.transition = "all, all";
-shouldBe("style.transition", "''");
-shouldBe("computedStyle.transition", "'all 0s ease 0s'");
-shouldBe("style.webkitTransition", "''");
-shouldBe("computedStyle.webkitTransition", "'all 0s ease 0s'");
-
document.body.removeChild(testContainer);
</script>
<script src=""
Modified: trunk/Source/WebCore/ChangeLog (144643 => 144644)
--- trunk/Source/WebCore/ChangeLog 2013-03-04 18:34:15 UTC (rev 144643)
+++ trunk/Source/WebCore/ChangeLog 2013-03-04 18:49:29 UTC (rev 144644)
@@ -1,3 +1,19 @@
+2013-03-04 Alexis Menard <[email protected]>
+
+ transition-property property and transition shorthand property doesn't accept "all, all".
+ https://bugs.webkit.org/show_bug.cgi?id=111201
+
+ Reviewed by Simon Fraser.
+
+ Relax the parsing of transition-property to allow all, all as a value.
+ It is not very useful per say but it is possible by the spec and we
+ align with Firefox, IE and Opera.
+
+ Test: LayoutTests/transitions/transitions-parsing.html
+
+ * css/CSSParser.cpp:
+ (WebCore::CSSParser::parseAnimationProperty):
+
2013-03-04 Min Qin <[email protected]>
Don't apply page scale to clipRect if applyPageScaleFactorInCompositor is set to true
Modified: trunk/Source/WebCore/css/CSSParser.cpp (144643 => 144644)
--- trunk/Source/WebCore/css/CSSParser.cpp 2013-03-04 18:34:15 UTC (rev 144643)
+++ trunk/Source/WebCore/css/CSSParser.cpp 2013-03-04 18:49:29 UTC (rev 144644)
@@ -4445,8 +4445,6 @@
if (result)
return cssValuePool().createIdentifierValue(result);
if (equalIgnoringCase(value, "all")) {
- if (context.hasSeenAnimationPropertyKeyword())
- context.commitAnimationPropertyKeyword();
context.sawAnimationPropertyKeyword();
return cssValuePool().createIdentifierValue(CSSValueAll);
}
