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

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

Issue 1164573002: CSSValue Immediates: Change CSSValue to an object instead of a pointer (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase Created 5 years, 5 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/LengthPairStyleInterpolation.cpp
diff --git a/Source/core/animation/LengthPairStyleInterpolation.cpp b/Source/core/animation/LengthPairStyleInterpolation.cpp
index 4996158d7cdc8665d889500394e1af2be4222844..2a93d97fcaca205dd42e5625dd802dc21a12a855 100644
--- a/Source/core/animation/LengthPairStyleInterpolation.cpp
+++ b/Source/core/animation/LengthPairStyleInterpolation.cpp
@@ -22,12 +22,12 @@ PassOwnPtrWillBeRawPtr<InterpolableValue> LengthPairStyleInterpolation::lengthPa
Pair* pair = toCSSPrimitiveValue(value).getPairValue();
ASSERT(pair);
- result->set(0, LengthStyleInterpolation::toInterpolableValue(*pair->first()));
- result->set(1, LengthStyleInterpolation::toInterpolableValue(*pair->second()));
+ result->set(0, LengthStyleInterpolation::toInterpolableValue(CSSValue(*pair->first())));
+ result->set(1, LengthStyleInterpolation::toInterpolableValue(CSSValue(*pair->second())));
return result.release();
}
-PassRefPtrWillBeRawPtr<CSSValue> LengthPairStyleInterpolation::interpolableValueToLengthPair(InterpolableValue* value, InterpolationRange range)
+CSSValue LengthPairStyleInterpolation::interpolableValueToLengthPair(InterpolableValue* value, InterpolationRange range)
{
InterpolableList* lengthPair = toInterpolableList(value);
RefPtrWillBeRawPtr<CSSPrimitiveValue> first = LengthStyleInterpolation::fromInterpolableValue(*lengthPair->get(0), range);
@@ -39,7 +39,7 @@ PassRefPtrWillBeRawPtr<CSSValue> LengthPairStyleInterpolation::interpolableValue
void LengthPairStyleInterpolation::apply(StyleResolverState& state) const
{
- StyleBuilder::applyProperty(m_id, state, interpolableValueToLengthPair(m_cachedValue.get(), m_range).get());
+ StyleBuilder::applyProperty(m_id, state, interpolableValueToLengthPair(m_cachedValue.get(), m_range));
}
} // namespace blink
« no previous file with comments | « Source/core/animation/LengthPairStyleInterpolation.h ('k') | Source/core/animation/LengthPairStyleInterpolationTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698