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) |