Source/core/animation/StringKeyframe.h - Issue 851693007: Prepare for responsive CSS animations.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: Source/core/animation/StringKeyframe.h

Issue 851693007: Prepare for responsive CSS animations. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Attempt to re-snapshot only if needed Created 5 years, 11 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

« Source/core/animation/InterpolationEffect.h ('K') | « Source/core/animation/KeyframeEffectModel.h ('k') | Source/core/animation/StringKeyframe.cpp » ('j') | Source/core/animation/StringKeyframe.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/animation/StringKeyframe.h

diff --git a/Source/core/animation/StringKeyframe.h b/Source/core/animation/StringKeyframe.h

index b6b6a2d8eb40ea2a35bff59a962e9cc5115a4dd6..99dc7faa8b3dbffd05e92050300263274324aec1 100644

--- a/Source/core/animation/StringKeyframe.h

+++ b/Source/core/animation/StringKeyframe.h

@@ -19,6 +19,8 @@ public:

return adoptRefWillBeNoop(new StringKeyframe);

}

void setPropertyValue(CSSPropertyID, const String& value, StyleSheetContents*);

+ void setPropertyValue(CSSPropertyID, PassRefPtr<CSSValue>);

+ void setPropertyAnimatableValue(CSSPropertyID, PassRefPtr<AnimatableValue>);

void clearPropertyValue(CSSPropertyID property) { m_propertySet->removeProperty(property); }

CSSValue* propertyValue(CSSPropertyID property) const

{

@@ -33,7 +35,7 @@ public:

class PropertySpecificKeyframe : public Keyframe::PropertySpecificKeyframe {

public:

- PropertySpecificKeyframe(double offset, PassRefPtr<TimingFunction> easing, CSSValue*, AnimationEffect::CompositeOperation);

+ PropertySpecificKeyframe(double offset, PassRefPtr<TimingFunction> easing, CSSValue*, AnimationEffect::CompositeOperation, PassRefPtr<AnimatableValue> = nullptr);

CSSValue* value() const { return m_value.get(); }

virtual const PassRefPtrWillBeRawPtr<AnimatableValue> getAnimatableValue() const override final { return m_animatableValueCache.get(); }

@@ -66,6 +68,7 @@ private:

virtual bool isStringKeyframe() const override { return true; }

RefPtrWillBeMember<MutableStylePropertySet> m_propertySet;

+ WillBeHeapHashMap<CSSPropertyID, RefPtrWillBeMember<AnimatableValue>> m_cachedAnimatableValues;

};

using StringPropertySpecificKeyframe = StringKeyframe::PropertySpecificKeyframe;