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

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

Issue 1317523002: Changed Pair to be a CSSValue (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@add_const_to_primvalue
Patch Set: Rebase 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/LengthPairStyleInterpolation.cpp
diff --git a/Source/core/animation/LengthPairStyleInterpolation.cpp b/Source/core/animation/LengthPairStyleInterpolation.cpp
index 4996158d7cdc8665d889500394e1af2be4222844..e15120aa2ec36bfa602aec890a2d9ed8f27fc67c 100644
--- a/Source/core/animation/LengthPairStyleInterpolation.cpp
+++ b/Source/core/animation/LengthPairStyleInterpolation.cpp
@@ -6,24 +6,23 @@
#include "core/animation/LengthPairStyleInterpolation.h"
#include "core/animation/LengthStyleInterpolation.h"
-#include "core/css/Pair.h"
+#include "core/css/CSSValuePair.h"
#include "core/css/resolver/StyleBuilder.h"
namespace blink {
bool LengthPairStyleInterpolation::canCreateFrom(const CSSValue& value)
{
- return value.isPrimitiveValue() && toCSSPrimitiveValue(value).getPairValue();
+ return value.isValuePair();
}
PassOwnPtrWillBeRawPtr<InterpolableValue> LengthPairStyleInterpolation::lengthPairToInterpolableValue(const CSSValue& value)
{
OwnPtrWillBeRawPtr<InterpolableList> result = InterpolableList::create(2);
- Pair* pair = toCSSPrimitiveValue(value).getPairValue();
- ASSERT(pair);
+ const CSSValuePair& pair = toCSSValuePair(value);
- result->set(0, LengthStyleInterpolation::toInterpolableValue(*pair->first()));
- result->set(1, LengthStyleInterpolation::toInterpolableValue(*pair->second()));
+ result->set(0, LengthStyleInterpolation::toInterpolableValue(*pair.first()));
+ result->set(1, LengthStyleInterpolation::toInterpolableValue(*pair.second()));
return result.release();
}
@@ -32,9 +31,7 @@ PassRefPtrWillBeRawPtr<CSSValue> LengthPairStyleInterpolation::interpolableValue
InterpolableList* lengthPair = toInterpolableList(value);
RefPtrWillBeRawPtr<CSSPrimitiveValue> first = LengthStyleInterpolation::fromInterpolableValue(*lengthPair->get(0), range);
RefPtrWillBeRawPtr<CSSPrimitiveValue> second = LengthStyleInterpolation::fromInterpolableValue(*lengthPair->get(1), range);
- RefPtrWillBeRawPtr<Pair> result = Pair::create(first, second, Pair::KeepIdenticalValues);
-
- return CSSPrimitiveValue::create(result.release());
+ return CSSValuePair::create(first.release(), second.release(), CSSValuePair::KeepIdenticalValues);
}
void LengthPairStyleInterpolation::apply(StyleResolverState& state) const
« no previous file with comments | « Source/core/animation/DeferredLegacyStyleInterpolation.cpp ('k') | Source/core/animation/LengthPairStyleInterpolationTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698