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

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

Issue 1318143005: Add mutableComponent() interface to InterpolationValue (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 3 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/InterpolationType.h
diff --git a/Source/core/animation/InterpolationType.h b/Source/core/animation/InterpolationType.h
index 233079dcb41ebbbd6ba9dc268df9c36e80005a65..5724720984875bbe595e7990e1768aa032527d27 100644
--- a/Source/core/animation/InterpolationType.h
+++ b/Source/core/animation/InterpolationType.h
@@ -6,6 +6,7 @@
#define InterpolationType_h
#include "core/animation/InterpolableValue.h"
+#include "core/animation/InterpolationValue.h"
#include "core/animation/NonInterpolableValue.h"
#include "core/animation/PrimitiveInterpolation.h"
#include "core/animation/StringKeyframe.h"
@@ -46,7 +47,12 @@ public:
OwnPtr<InterpolationValue> endValue = maybeConvertSingle(endKeyframe, state, conversionCheckers);
if (!endValue)
return nullptr;
- return PairwisePrimitiveInterpolation::create(*this, startValue->m_interpolableValue.release(), endValue->m_interpolableValue.release(), startValue->m_nonInterpolableValue.release());
+ ASSERT(!startValue->nonInterpolableValue());
+ ASSERT(!endValue->nonInterpolableValue());
+ return PairwisePrimitiveInterpolation::create(*this,
+ startValue->mutableComponent().interpolableValue.release(),
+ endValue->mutableComponent().interpolableValue.release(),
+ nullptr);
}
virtual PassOwnPtr<InterpolationValue> maybeConvertSingle(const CSSPropertySpecificKeyframe& keyframe, const StyleResolverState* state, ConversionCheckers& conversionCheckers) const
« no previous file with comments | « no previous file | Source/core/animation/InterpolationValue.h » ('j') | Source/core/animation/InterpolationValue.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698