Title: [209355] trunk/Source/WebCore
- Revision
- 209355
- Author
- [email protected]
- Date
- 2016-12-05 14:53:23 -0800 (Mon, 05 Dec 2016)
Log Message
[CSS Parser] Leave the Animation type alone when the property is invalid
https://bugs.webkit.org/show_bug.cgi?id=165418
Reviewed by Dean Jackson.
* css/CSSToStyleMap.cpp:
(WebCore::CSSToStyleMap::mapAnimationProperty):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (209354 => 209355)
--- trunk/Source/WebCore/ChangeLog 2016-12-05 22:52:38 UTC (rev 209354)
+++ trunk/Source/WebCore/ChangeLog 2016-12-05 22:53:23 UTC (rev 209355)
@@ -1,3 +1,13 @@
+2016-12-05 Dave Hyatt <[email protected]>
+
+ [CSS Parser] Leave the Animation type alone when the property is invalid
+ https://bugs.webkit.org/show_bug.cgi?id=165418
+
+ Reviewed by Dean Jackson.
+
+ * css/CSSToStyleMap.cpp:
+ (WebCore::CSSToStyleMap::mapAnimationProperty):
+
2016-12-05 Antti Koivisto <[email protected]>
keyframes do not work when defined inside a style in a shadowRoot
Modified: trunk/Source/WebCore/css/CSSToStyleMap.cpp (209354 => 209355)
--- trunk/Source/WebCore/css/CSSToStyleMap.cpp 2016-12-05 22:52:38 UTC (rev 209354)
+++ trunk/Source/WebCore/css/CSSToStyleMap.cpp 2016-12-05 22:53:23 UTC (rev 209355)
@@ -447,10 +447,9 @@
} else if (primitiveValue.valueID() == CSSValueNone) {
animation.setAnimationMode(Animation::AnimateNone);
animation.setProperty(CSSPropertyInvalid);
- } else {
+ } else if (primitiveValue.propertyID() != CSSPropertyInvalid) {
animation.setAnimationMode(Animation::AnimateSingleProperty);
- if (primitiveValue.propertyID() != CSSPropertyInvalid)
- animation.setProperty(primitiveValue.propertyID());
+ animation.setProperty(primitiveValue.propertyID());
}
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes