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

Unified Diff: Source/core/animation/KeyframeEffectModel.cpp

Issue 948583003: Use StringKeyframes to make CSS Animations responsive to style changes (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase Created 5 years, 9 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
« no previous file with comments | « Source/core/animation/KeyframeEffectModel.h ('k') | Source/core/animation/css/CSSAnimations.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/animation/KeyframeEffectModel.cpp
diff --git a/Source/core/animation/KeyframeEffectModel.cpp b/Source/core/animation/KeyframeEffectModel.cpp
index 6051222e904dac924f6a0850cd6bd76294268b7a..843b9c9d55740073199c1f29418973ad7d7c0d2d 100644
--- a/Source/core/animation/KeyframeEffectModel.cpp
+++ b/Source/core/animation/KeyframeEffectModel.cpp
@@ -84,12 +84,12 @@ void KeyframeEffectModelBase::snapshotCompositableProperties(Element& element, c
}
}
-void KeyframeEffectModelBase::updateNeutralKeyframeAnimatableValues(CSSPropertyID property, PassRefPtrWillBeRawPtr<AnimatableValue> value)
+bool KeyframeEffectModelBase::updateNeutralKeyframeAnimatableValues(CSSPropertyID property, PassRefPtrWillBeRawPtr<AnimatableValue> value)
{
ASSERT(CompositorAnimations::isCompositableProperty(property));
if (!value)
- return;
+ return false;
ensureKeyframeGroups();
auto& keyframes = m_keyframeGroups->get(property)->m_keyframes;
@@ -97,12 +97,12 @@ void KeyframeEffectModelBase::updateNeutralKeyframeAnimatableValues(CSSPropertyI
auto& first = toStringPropertySpecificKeyframe(*keyframes.first());
auto& last = toStringPropertySpecificKeyframe(*keyframes.last());
- ASSERT(!first.value() || !last.value());
if (!first.value())
first.setAnimatableValue(value);
if (!last.value())
last.setAnimatableValue(value);
+ return !first.value() || !last.value();
}
KeyframeEffectModelBase::KeyframeVector KeyframeEffectModelBase::normalizedKeyframes(const KeyframeVector& keyframes)
« no previous file with comments | « Source/core/animation/KeyframeEffectModel.h ('k') | Source/core/animation/css/CSSAnimations.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698