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

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

Issue 999963003: Add base LayoutStyle parameter to createAnimatableValueSnapshot() (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Missing include 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/StringKeyframe.h ('k') | Source/core/animation/animatable/AnimatableValueKeyframe.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/animation/StringKeyframe.cpp
diff --git a/Source/core/animation/StringKeyframe.cpp b/Source/core/animation/StringKeyframe.cpp
index 63180ddafa3afc07c53518065ba37a8963294d48..3aa81904ea03a9d174a6b4a3d17f8f4bfb0783b1 100644
--- a/Source/core/animation/StringKeyframe.cpp
+++ b/Source/core/animation/StringKeyframe.cpp
@@ -84,10 +84,10 @@ StringKeyframe::PropertySpecificKeyframe::PropertySpecificKeyframe(double offset
ASSERT(!isNull(m_offset));
}
-void StringKeyframe::PropertySpecificKeyframe::ensureAnimatableValue(CSSPropertyID property, Element& element) const
+void StringKeyframe::PropertySpecificKeyframe::ensureAnimatableValue(CSSPropertyID property, Element& element, const LayoutStyle* baseStyle) const
{
if (!m_animatableValueCache)
- m_animatableValueCache = StyleResolver::createAnimatableValueSnapshot(element, property, m_value.get());
+ m_animatableValueCache = StyleResolver::createAnimatableValueSnapshot(element, baseStyle, property, m_value.get());
}
namespace {
@@ -120,7 +120,7 @@ InterpolationRange setRange(CSSPropertyID id)
} // namespace
// FIXME: Refactor this into a generic piece that lives in InterpolationEffect, and a template parameter specific converter.
-PassRefPtrWillBeRawPtr<Interpolation> StringKeyframe::PropertySpecificKeyframe::maybeCreateInterpolation(CSSPropertyID property, Keyframe::PropertySpecificKeyframe& end, Element* element) const
+PassRefPtrWillBeRawPtr<Interpolation> StringKeyframe::PropertySpecificKeyframe::maybeCreateInterpolation(CSSPropertyID property, Keyframe::PropertySpecificKeyframe& end, Element* element, const LayoutStyle* baseStyle) const
{
CSSValue* fromCSSValue = m_value.get();
CSSValue* toCSSValue = toStringPropertySpecificKeyframe(end).value();
@@ -372,14 +372,14 @@ PassRefPtrWillBeRawPtr<Interpolation> StringKeyframe::PropertySpecificKeyframe::
// FIXME: Remove the use of AnimatableValues and Elements here.
ASSERT(element);
- ensureAnimatableValue(property, *element);
- end.ensureAnimatableValue(property, *element);
+ ensureAnimatableValue(property, *element, baseStyle);
+ end.ensureAnimatableValue(property, *element, baseStyle);
return LegacyStyleInterpolation::create(getAnimatableValue(), end.getAnimatableValue(), property);
}
ASSERT(AnimatableValue::usesDefaultInterpolation(
- StyleResolver::createAnimatableValueSnapshot(*element, property, fromCSSValue).get(),
- StyleResolver::createAnimatableValueSnapshot(*element, property, toCSSValue).get()));
+ StyleResolver::createAnimatableValueSnapshot(*element, baseStyle, property, fromCSSValue).get(),
+ StyleResolver::createAnimatableValueSnapshot(*element, baseStyle, property, toCSSValue).get()));
return nullptr;
« no previous file with comments | « Source/core/animation/StringKeyframe.h ('k') | Source/core/animation/animatable/AnimatableValueKeyframe.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698