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

Unified Diff: third_party/WebKit/Source/core/animation/CSSValueInterpolationType.cpp

Issue 2630503002: Add code path for registered custom properties in CSSInterpolationType (Closed)
Patch Set: Moar buttons Created 3 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
« no previous file with comments | « third_party/WebKit/Source/core/animation/CSSValueInterpolationType.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/animation/CSSValueInterpolationType.cpp
diff --git a/third_party/WebKit/Source/core/animation/CSSValueInterpolationType.cpp b/third_party/WebKit/Source/core/animation/CSSValueInterpolationType.cpp
index 50acd0214ae1ef91cb33e91c86f52829a50c6d1e..c448b2309d2ac7766b44d7da7560b9d9e7634c68 100644
--- a/third_party/WebKit/Source/core/animation/CSSValueInterpolationType.cpp
+++ b/third_party/WebKit/Source/core/animation/CSSValueInterpolationType.cpp
@@ -21,7 +21,7 @@ class CSSValueNonInterpolableValue : public NonInterpolableValue {
return adoptRef(new CSSValueNonInterpolableValue(cssValue));
}
- const CSSValue& cssValue() const { return *m_cssValue; }
+ const CSSValue* cssValue() const { return m_cssValue.get(); }
DECLARE_NON_INTERPOLABLE_VALUE_TYPE();
@@ -65,7 +65,14 @@ void CSSValueInterpolationType::applyStandardPropertyValue(
StyleResolverState& state) const {
StyleBuilder::applyProperty(
cssProperty(), state,
- toCSSValueNonInterpolableValue(nonInterpolableValue)->cssValue());
+ *createCSSValue(interpolableValue, nonInterpolableValue, state));
+}
+
+const CSSValue* CSSValueInterpolationType::createCSSValue(
+ const InterpolableValue&,
+ const NonInterpolableValue* nonInterpolableValue,
+ const StyleResolverState&) const {
+ return toCSSValueNonInterpolableValue(nonInterpolableValue)->cssValue();
}
} // namespace blink
« no previous file with comments | « third_party/WebKit/Source/core/animation/CSSValueInterpolationType.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698