| Index: third_party/WebKit/Source/core/animation/StringKeyframe.h
|
| diff --git a/third_party/WebKit/Source/core/animation/StringKeyframe.h b/third_party/WebKit/Source/core/animation/StringKeyframe.h
|
| index 411aedf6945b2e58c8429f34543756b73f37f5ee..fa161e69f6f8517d7733b0ea7bbb071ac70744fc 100644
|
| --- a/third_party/WebKit/Source/core/animation/StringKeyframe.h
|
| +++ b/third_party/WebKit/Source/core/animation/StringKeyframe.h
|
| @@ -57,7 +57,7 @@ public:
|
|
|
| CSSValue* value() const { return m_value.get(); }
|
|
|
| - virtual bool populateAnimatableValue(CSSPropertyID, Element&, const ComputedStyle* baseStyle, bool force) const;
|
| + bool populateAnimatableValue(CSSPropertyID, Element&, const ComputedStyle& baseStyle, const ComputedStyle* parentStyle) const final;
|
| const PassRefPtr<AnimatableValue> getAnimatableValue() const final { return m_animatableValueCache.get(); }
|
| void setAnimatableValue(PassRefPtr<AnimatableValue> value) { m_animatableValueCache = value; }
|
|
|
|
|