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

Unified Diff: sky/engine/core/css/CSSComputedStyleDeclaration.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/animation/css/CSSAnimations.cpp ('k') | sky/engine/core/css/CSSProperties.in » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/css/CSSComputedStyleDeclaration.cpp
diff --git a/sky/engine/core/css/CSSComputedStyleDeclaration.cpp b/sky/engine/core/css/CSSComputedStyleDeclaration.cpp
index 6ffbf8110094fbfa02e7cad20b7d6216b9d1b303..b3d6854a08ce82d1284c045c93d3041076ba9bd3 100644
--- a/sky/engine/core/css/CSSComputedStyleDeclaration.cpp
+++ b/sky/engine/core/css/CSSComputedStyleDeclaration.cpp
@@ -193,14 +193,6 @@ static const CSSPropertyID staticComputableProperties[] = {
CSSPropertyWordWrap,
CSSPropertyZIndex,
- CSSPropertyWebkitAnimationDelay,
- CSSPropertyWebkitAnimationDirection,
- CSSPropertyWebkitAnimationDuration,
- CSSPropertyWebkitAnimationFillMode,
- CSSPropertyWebkitAnimationIterationCount,
- CSSPropertyWebkitAnimationName,
- CSSPropertyWebkitAnimationPlayState,
- CSSPropertyWebkitAnimationTimingFunction,
CSSPropertyBackfaceVisibility,
CSSPropertyWebkitBackfaceVisibility,
CSSPropertyWebkitBackgroundClip,
@@ -263,10 +255,6 @@ static const CSSPropertyID staticComputableProperties[] = {
CSSPropertyWebkitTransformOrigin,
CSSPropertyTransformStyle,
CSSPropertyWebkitTransformStyle,
- CSSPropertyWebkitTransitionDelay,
- CSSPropertyWebkitTransitionDuration,
- CSSPropertyWebkitTransitionProperty,
- CSSPropertyWebkitTransitionTimingFunction,
CSSPropertyWebkitUserDrag,
CSSPropertyWebkitUserModify,
CSSPropertyWebkitUserSelect,
@@ -1872,12 +1860,8 @@ PassRefPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValue(CSSPropert
return cssValuePool().createIdentifierValue(CSSValueContentBox);
return cssValuePool().createIdentifierValue(CSSValueBorderBox);
case CSSPropertyAnimationDelay:
- ASSERT(RuntimeEnabledFeatures::cssAnimationUnprefixedEnabled());
- case CSSPropertyWebkitAnimationDelay:
return valueForAnimationDelay(style->animations());
- case CSSPropertyAnimationDirection:
- ASSERT(RuntimeEnabledFeatures::cssAnimationUnprefixedEnabled());
- case CSSPropertyWebkitAnimationDirection: {
+ case CSSPropertyAnimationDirection: {
RefPtr<CSSValueList> list = CSSValueList::createCommaSeparated();
const CSSAnimationData* animationData = style->animations();
if (animationData) {
@@ -1889,12 +1873,8 @@ PassRefPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValue(CSSPropert
return list.release();
}
case CSSPropertyAnimationDuration:
- ASSERT(RuntimeEnabledFeatures::cssAnimationUnprefixedEnabled());
- case CSSPropertyWebkitAnimationDuration:
return valueForAnimationDuration(style->animations());
- case CSSPropertyAnimationFillMode:
- ASSERT(RuntimeEnabledFeatures::cssAnimationUnprefixedEnabled());
- case CSSPropertyWebkitAnimationFillMode: {
+ case CSSPropertyAnimationFillMode: {
RefPtr<CSSValueList> list = CSSValueList::createCommaSeparated();
const CSSAnimationData* animationData = style->animations();
if (animationData) {
@@ -1905,9 +1885,7 @@ PassRefPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValue(CSSPropert
}
return list.release();
}
- case CSSPropertyAnimationIterationCount:
- ASSERT(RuntimeEnabledFeatures::cssAnimationUnprefixedEnabled());
- case CSSPropertyWebkitAnimationIterationCount: {
+ case CSSPropertyAnimationIterationCount: {
RefPtr<CSSValueList> list = CSSValueList::createCommaSeparated();
const CSSAnimationData* animationData = style->animations();
if (animationData) {
@@ -1918,9 +1896,7 @@ PassRefPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValue(CSSPropert
}
return list.release();
}
- case CSSPropertyAnimationName:
- ASSERT(RuntimeEnabledFeatures::cssAnimationUnprefixedEnabled());
- case CSSPropertyWebkitAnimationName: {
+ case CSSPropertyAnimationName: {
RefPtr<CSSValueList> list = CSSValueList::createCommaSeparated();
const CSSAnimationData* animationData = style->animations();
if (animationData) {
@@ -1931,9 +1907,7 @@ PassRefPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValue(CSSPropert
}
return list.release();
}
- case CSSPropertyAnimationPlayState:
- ASSERT(RuntimeEnabledFeatures::cssAnimationUnprefixedEnabled());
- case CSSPropertyWebkitAnimationPlayState: {
+ case CSSPropertyAnimationPlayState: {
RefPtr<CSSValueList> list = CSSValueList::createCommaSeparated();
const CSSAnimationData* animationData = style->animations();
if (animationData) {
@@ -1945,11 +1919,8 @@ PassRefPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValue(CSSPropert
return list.release();
}
case CSSPropertyAnimationTimingFunction:
- ASSERT(RuntimeEnabledFeatures::cssAnimationUnprefixedEnabled());
- case CSSPropertyWebkitAnimationTimingFunction:
return valueForAnimationTimingFunction(style->animations());
- case CSSPropertyAnimation:
- case CSSPropertyWebkitAnimation: {
+ case CSSPropertyAnimation: {
const CSSAnimationData* animationData = style->animations();
if (animationData) {
RefPtr<CSSValueList> animationsList = CSSValueList::createCommaSeparated();
@@ -2093,19 +2064,14 @@ PassRefPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValue(CSSPropert
case CSSPropertyWebkitTransformStyle:
return cssValuePool().createIdentifierValue((style->transformStyle3D() == TransformStyle3DPreserve3D) ? CSSValuePreserve3d : CSSValueFlat);
case CSSPropertyTransitionDelay:
- case CSSPropertyWebkitTransitionDelay:
return valueForAnimationDelay(style->transitions());
case CSSPropertyTransitionDuration:
- case CSSPropertyWebkitTransitionDuration:
return valueForAnimationDuration(style->transitions());
case CSSPropertyTransitionProperty:
- case CSSPropertyWebkitTransitionProperty:
return valueForTransitionProperty(style->transitions());
case CSSPropertyTransitionTimingFunction:
- case CSSPropertyWebkitTransitionTimingFunction:
return valueForAnimationTimingFunction(style->transitions());
- case CSSPropertyTransition:
- case CSSPropertyWebkitTransition: {
+ case CSSPropertyTransition: {
const CSSTransitionData* transitionData = style->transitions();
if (transitionData) {
RefPtr<CSSValueList> transitionsList = CSSValueList::createCommaSeparated();
« no previous file with comments | « sky/engine/core/animation/css/CSSAnimations.cpp ('k') | sky/engine/core/css/CSSProperties.in » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698