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

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

Issue 1033943002: Rename LayoutStyle to papayawhip (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: ensureComputedStyle 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/Keyframe.h ('k') | Source/core/animation/KeyframeEffectModel.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/animation/KeyframeEffectModel.h
diff --git a/Source/core/animation/KeyframeEffectModel.h b/Source/core/animation/KeyframeEffectModel.h
index aa8c02dc7193f8211aa5de38ddc7cfde3441f9ae..2a83ab16af40914f358c4f07fefcdbc421ee8a9e 100644
--- a/Source/core/animation/KeyframeEffectModel.h
+++ b/Source/core/animation/KeyframeEffectModel.h
@@ -103,7 +103,7 @@ public:
// FIXME: This is a hack used to resolve CSSValues to AnimatableValues while we have a valid handle on an element.
// This should be removed once AnimatableValues are obsolete.
- void forceConversionsToAnimatableValues(Element&, const LayoutStyle* baseStyle);
+ void forceConversionsToAnimatableValues(Element&, const ComputedStyle* baseStyle);
bool updateNeutralKeyframeAnimatableValues(CSSPropertyID, PassRefPtrWillBeRawPtr<AnimatableValue>);
template<typename T>
@@ -127,8 +127,8 @@ protected:
// Lazily computes the groups of property-specific keyframes.
void ensureKeyframeGroups() const;
- void ensureInterpolationEffect(Element* = nullptr, const LayoutStyle* baseStyle = nullptr) const;
- void snapshotCompositableProperties(Element&, const LayoutStyle* baseStyle);
+ void ensureInterpolationEffect(Element* = nullptr, const ComputedStyle* baseStyle = nullptr) const;
+ void snapshotCompositableProperties(Element&, const ComputedStyle* baseStyle);
KeyframeVector m_keyframes;
// The spec describes filtering the normalized keyframes at sampling time
« no previous file with comments | « Source/core/animation/Keyframe.h ('k') | Source/core/animation/KeyframeEffectModel.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698