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

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

Issue 813233002: Animation: Fix loss of type information when interpolating value of 0 (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years 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 32df55446f47933b018da9cd8fcac637b0ab92a3..3163918538882904895237f647ba6f662d0a56be 100644
--- a/Source/core/animation/LengthPairStyleInterpolation.cpp
+++ b/Source/core/animation/LengthPairStyleInterpolation.cpp
@@ -29,15 +29,15 @@ PassOwnPtrWillBeRawPtr<InterpolableValue> LengthPairStyleInterpolation::lengthPa
static inline PassRefPtrWillBeRawPtr<CSSPrimitiveValue> toPrimitiveValue(PassRefPtrWillBeRawPtr<CSSValue> value)
{
- return adoptRefWillBeNoop(toCSSPrimitiveValue(value.leakRef()));
+ return adoptRef(toCSSPrimitiveValue(value.leakRef()));
}
PassRefPtrWillBeRawPtr<CSSValue> LengthPairStyleInterpolation::interpolableValueToLengthPair(InterpolableValue* value, ValueRange range)
{
InterpolableList* lengthPair = toInterpolableList(value);
- RefPtrWillBeRawPtr<CSSPrimitiveValue> first = toPrimitiveValue(LengthStyleInterpolation::interpolableValueToLength(lengthPair->get(0), range));
- RefPtrWillBeRawPtr<CSSPrimitiveValue> second = toPrimitiveValue(LengthStyleInterpolation::interpolableValueToLength(lengthPair->get(1), range));
- RefPtrWillBeRawPtr<Pair> result = Pair::create(first, second, Pair::KeepIdenticalValues);
+ RefPtr<CSSPrimitiveValue> first = toPrimitiveValue(LengthStyleInterpolation::interpolableValueToLength(lengthPair->get(0), range));
Eric Willigers 2014/12/19 03:16:29 RefPtrWillBeRawPtr was better - an Oilpan trybot w
evemj (not active) 2014/12/19 04:43:08 Done.
+ RefPtr<CSSPrimitiveValue> second = toPrimitiveValue(LengthStyleInterpolation::interpolableValueToLength(lengthPair->get(1), range));
+ RefPtr<Pair> result = Pair::create(first, second, Pair::KeepIdenticalValues);
return CSSPrimitiveValue::create(result.release());
}
@@ -47,4 +47,8 @@ void LengthPairStyleInterpolation::apply(StyleResolverState& state) const
StyleBuilder::applyProperty(m_id, state, interpolableValueToLengthPair(m_cachedValue.get(), m_range).get());
}
-} // namespace blink
+void LengthPairStyleInterpolation::trace(Visitor* visitor)
+{
+ StyleInterpolation::trace(visitor);
+}
+}

Powered by Google App Engine
This is Rietveld 408576698