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

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

Issue 1248093002: Move interpolated Length unit types out of InterpolableValue into NonInterpolableValue (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebased Created 5 years, 4 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
Index: Source/core/animation/InterpolationValue.h
diff --git a/Source/core/animation/InterpolationValue.h b/Source/core/animation/InterpolationValue.h
index a2d7b0ff83562a873a86e2dd9af361032403b558..6fc4c4ad5a9c21b1aecbdfea5e5ef646f2bf3e38 100644
--- a/Source/core/animation/InterpolationValue.h
+++ b/Source/core/animation/InterpolationValue.h
@@ -27,9 +27,11 @@ public:
const InterpolationType& type() const { return m_type; }
const InterpolableValue& interpolableValue() const { return *m_interpolableValue; }
- InterpolableValue& interpolableValue() { return *m_interpolableValue; }
const NonInterpolableValue* nonInterpolableValue() const { return m_nonInterpolableValue.get(); }
+ InterpolableValue& interpolableValue() { return *m_interpolableValue; }
+ void setNonInterpolableValue(PassRefPtrWillBeRawPtr<NonInterpolableValue> nonInterpolableValue) { m_nonInterpolableValue = nonInterpolableValue; }
+
DEFINE_INLINE_TRACE()
{
visitor->trace(m_interpolableValue);
@@ -37,7 +39,7 @@ public:
}
private:
- InterpolationValue(const InterpolationType& type, PassOwnPtrWillBeRawPtr<InterpolableValue> interpolableValue, PassRefPtrWillBeRawPtr<NonInterpolableValue> nonInterpolableValue = nullptr)
+ InterpolationValue(const InterpolationType& type, PassOwnPtrWillBeRawPtr<InterpolableValue> interpolableValue, PassRefPtrWillBeRawPtr<NonInterpolableValue> nonInterpolableValue)
: m_type(type)
, m_interpolableValue(interpolableValue)
, m_nonInterpolableValue(nonInterpolableValue)

Powered by Google App Engine
This is Rietveld 408576698