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

Unified Diff: Source/core/animation/css/CSSAnimations.cpp

Issue 1308073007: Don't special case transition-property: all in parsing and data storage (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 4 months 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
Index: Source/core/animation/css/CSSAnimations.cpp
diff --git a/Source/core/animation/css/CSSAnimations.cpp b/Source/core/animation/css/CSSAnimations.cpp
index bd47b0b5f3ccfc5f322466d9ff547dd5ef3c732e..c67f719a667f91c2df9d719afdd4c2794eefa90c 100644
--- a/Source/core/animation/css/CSSAnimations.cpp
+++ b/Source/core/animation/css/CSSAnimations.cpp
@@ -538,13 +538,11 @@ void CSSAnimations::calculateTransitionUpdate(CSSAnimationUpdate& update, const
for (size_t i = 0; i < transitionData->propertyList().size(); ++i) {
const CSSTransitionData::TransitionProperty& transitionProperty = transitionData->propertyList()[i];
- CSSTransitionData::TransitionPropertyType mode = transitionProperty.propertyType;
- CSSPropertyID property = resolveCSSPropertyID(transitionProperty.unresolvedProperty);
- if (mode == CSSTransitionData::TransitionNone || mode == CSSTransitionData::TransitionUnknown)
+ if (transitionProperty.propertyType != CSSTransitionData::TransitionKnownProperty)
continue;
- bool animateAll = mode == CSSTransitionData::TransitionAll;
- ASSERT(animateAll || mode == CSSTransitionData::TransitionSingleProperty);
+ CSSPropertyID property = resolveCSSPropertyID(transitionProperty.unresolvedProperty);
+ bool animateAll = property == CSSPropertyAll;
if (animateAll)
anyTransitionHadTransitionAll = true;
const StylePropertyShorthand& propertyList = animateAll ? CSSAnimations::propertiesForTransitionAll() : shorthandForProperty(property);
« no previous file with comments | « no previous file | Source/core/animation/css/CSSTransitionData.h » ('j') | Source/core/animation/css/CSSTransitionData.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698