Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(277)

Unified Diff: sky/engine/core/css/StylePropertySerializer.cpp

Issue 760183003: Enable/Unprefix Animations & Transitions, add basic tests (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: patch for landing Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « sky/engine/core/css/CSSProperty.h ('k') | sky/engine/core/css/StylePropertySet.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/css/StylePropertySerializer.cpp
diff --git a/sky/engine/core/css/StylePropertySerializer.cpp b/sky/engine/core/css/StylePropertySerializer.cpp
index ffba814c0d11315454508a82dd90d2f84c3cf5f7..5953053449b4ec0f0f751fbf2d514ef4ff9c98b5 100644
--- a/sky/engine/core/css/StylePropertySerializer.cpp
+++ b/sky/engine/core/css/StylePropertySerializer.cpp
@@ -76,6 +76,15 @@ String StylePropertySerializer::asText() const
String value;
switch (propertyID) {
+ case CSSPropertyAnimationName:
+ case CSSPropertyAnimationDuration:
+ case CSSPropertyAnimationTimingFunction:
+ case CSSPropertyAnimationDelay:
+ case CSSPropertyAnimationIterationCount:
+ case CSSPropertyAnimationDirection:
+ case CSSPropertyAnimationFillMode:
+ shorthandPropertyID = CSSPropertyAnimation;
+ break;
case CSSPropertyBackgroundAttachment:
case CSSPropertyBackgroundClip:
case CSSPropertyBackgroundColor:
@@ -164,15 +173,6 @@ String StylePropertySerializer::asText() const
case CSSPropertyTransitionDelay:
shorthandPropertyID = CSSPropertyTransition;
break;
- case CSSPropertyWebkitAnimationName:
- case CSSPropertyWebkitAnimationDuration:
- case CSSPropertyWebkitAnimationTimingFunction:
- case CSSPropertyWebkitAnimationDelay:
- case CSSPropertyWebkitAnimationIterationCount:
- case CSSPropertyWebkitAnimationDirection:
- case CSSPropertyWebkitAnimationFillMode:
- shorthandPropertyID = CSSPropertyWebkitAnimation;
- break;
case CSSPropertyFlexDirection:
case CSSPropertyFlexWrap:
shorthandPropertyID = CSSPropertyFlexFlow;
@@ -198,12 +198,6 @@ String StylePropertySerializer::asText() const
case CSSPropertyWebkitTransformOriginZ:
shorthandPropertyID = CSSPropertyWebkitTransformOrigin;
break;
- case CSSPropertyWebkitTransitionProperty:
- case CSSPropertyWebkitTransitionDuration:
- case CSSPropertyWebkitTransitionTimingFunction:
- case CSSPropertyWebkitTransitionDelay:
- shorthandPropertyID = CSSPropertyWebkitTransition;
- break;
default:
break;
}
@@ -299,10 +293,6 @@ String StylePropertySerializer::getPropertyValue(CSSPropertyID propertyID) const
case CSSPropertyTransformOrigin:
case CSSPropertyWebkitTransformOrigin:
return getShorthandValue(webkitTransformOriginShorthand());
- case CSSPropertyWebkitTransition:
- return getLayeredShorthandValue(webkitTransitionShorthand());
- case CSSPropertyWebkitAnimation:
- return getLayeredShorthandValue(webkitAnimationShorthand());
case CSSPropertyBorderRadius:
return get4Values(borderRadiusShorthand());
default:
« no previous file with comments | « sky/engine/core/css/CSSProperty.h ('k') | sky/engine/core/css/StylePropertySet.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698