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

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

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/KeyframeEffectModel.h ('k') | Source/core/animation/LengthStyleInterpolation.h » ('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 001535c216868570e124dd9c24e621eb0ab29f2f..f0a673b17202e45f1f5eb8041c1aff1a159fa734 100644
--- a/Source/core/animation/KeyframeEffectModel.cpp
+++ b/Source/core/animation/KeyframeEffectModel.cpp
@@ -65,14 +65,14 @@ void KeyframeEffectModelBase::sample(int iteration, double fraction, double iter
return m_interpolationEffect->getActiveInterpolations(fraction, iterationDuration, result);
}
-void KeyframeEffectModelBase::forceConversionsToAnimatableValues(Element& element, const LayoutStyle* baseStyle)
+void KeyframeEffectModelBase::forceConversionsToAnimatableValues(Element& element, const ComputedStyle* baseStyle)
{
ensureKeyframeGroups();
snapshotCompositableProperties(element, baseStyle);
ensureInterpolationEffect(&element, baseStyle);
}
-void KeyframeEffectModelBase::snapshotCompositableProperties(Element& element, const LayoutStyle* baseStyle)
+void KeyframeEffectModelBase::snapshotCompositableProperties(Element& element, const ComputedStyle* baseStyle)
{
ensureKeyframeGroups();
for (CSSPropertyID property : CompositorAnimations::CompositableProperties) {
@@ -176,7 +176,7 @@ void KeyframeEffectModelBase::ensureKeyframeGroups() const
}
}
-void KeyframeEffectModelBase::ensureInterpolationEffect(Element* element, const LayoutStyle* baseStyle) const
+void KeyframeEffectModelBase::ensureInterpolationEffect(Element* element, const ComputedStyle* baseStyle) const
{
if (m_interpolationEffect)
return;
« no previous file with comments | « Source/core/animation/KeyframeEffectModel.h ('k') | Source/core/animation/LengthStyleInterpolation.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698