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

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

Issue 1225553002: CSSValue Immediates: Make CSSPrimitiveValue a container (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@cssvalue_patch_1
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/LengthPairStyleInterpolationTest.cpp
diff --git a/Source/core/animation/LengthPairStyleInterpolationTest.cpp b/Source/core/animation/LengthPairStyleInterpolationTest.cpp
index a4a4373cba0861c442c1e09d6aa886006edb3942..1671d5b3b85507cd8457469575a78410b4b844c8 100644
--- a/Source/core/animation/LengthPairStyleInterpolationTest.cpp
+++ b/Source/core/animation/LengthPairStyleInterpolationTest.cpp
@@ -39,36 +39,36 @@ protected:
Pair* pair = toCSSPrimitiveValue(value).getPairValue();
ASSERT_TRUE(pair);
- EXPECT_EQ(pair->first()->getDoubleValue(), first);
- EXPECT_EQ(pair->second()->getDoubleValue(), second);
+ EXPECT_EQ(toCSSPrimitiveValue(*pair->first()).getDoubleValue(), first);
+ EXPECT_EQ(toCSSPrimitiveValue(*pair->second()).getDoubleValue(), second);
- EXPECT_EQ(pair->first()->primitiveType(), unitType);
- EXPECT_EQ(pair->second()->primitiveType(), unitType);
+ EXPECT_EQ(toCSSPrimitiveValue(*pair->first()).primitiveType(), unitType);
+ EXPECT_EQ(toCSSPrimitiveValue(*pair->second()).primitiveType(), unitType);
}
};
TEST_F(LengthPairStyleInterpolationTest, ZeroTest)
{
- RefPtrWillBeRawPtr<CSSPrimitiveValue> firstPx = CSSPrimitiveValue::create(0, CSSPrimitiveValue::CSS_PX);
- RefPtrWillBeRawPtr<CSSPrimitiveValue> secondPx = CSSPrimitiveValue::create(0, CSSPrimitiveValue::CSS_PX);
+ CSSPrimitiveValue firstPx = CSSPrimitiveValue::create(0, CSSPrimitiveValue::CSS_PX);
+ CSSPrimitiveValue secondPx = CSSPrimitiveValue::create(0, CSSPrimitiveValue::CSS_PX);
RefPtrWillBeRawPtr<Pair> pairPx = Pair::create(firstPx, secondPx, Pair::KeepIdenticalValues);
CSSValue value1 = roundTrip(CSSPrimitiveValue::create(pairPx.release()), RangeNonNegative);
testPrimitiveValue(value1, 0, 0, CSSPrimitiveValue::CSS_PX);
- RefPtrWillBeRawPtr<CSSPrimitiveValue> firstPc = CSSPrimitiveValue::create(0, CSSPrimitiveValue::CSS_PERCENTAGE);
- RefPtrWillBeRawPtr<CSSPrimitiveValue> secondPc = CSSPrimitiveValue::create(0, CSSPrimitiveValue::CSS_PERCENTAGE);
+ CSSPrimitiveValue firstPc = CSSPrimitiveValue::create(0, CSSPrimitiveValue::CSS_PERCENTAGE);
+ CSSPrimitiveValue secondPc = CSSPrimitiveValue::create(0, CSSPrimitiveValue::CSS_PERCENTAGE);
RefPtrWillBeRawPtr<Pair> pairPc = Pair::create(firstPc, secondPc, Pair::KeepIdenticalValues);
CSSValue value2 = roundTrip(CSSPrimitiveValue::create(pairPc.release()), RangeNonNegative);
testPrimitiveValue(value2, 0, 0, CSSPrimitiveValue::CSS_PERCENTAGE);
- RefPtrWillBeRawPtr<CSSPrimitiveValue> firstEms = CSSPrimitiveValue::create(0, CSSPrimitiveValue::CSS_EMS);
- RefPtrWillBeRawPtr<CSSPrimitiveValue> secondEms = CSSPrimitiveValue::create(0, CSSPrimitiveValue::CSS_EMS);
+ CSSPrimitiveValue firstEms = CSSPrimitiveValue::create(0, CSSPrimitiveValue::CSS_EMS);
+ CSSPrimitiveValue secondEms = CSSPrimitiveValue::create(0, CSSPrimitiveValue::CSS_EMS);
RefPtrWillBeRawPtr<Pair> pairEms = Pair::create(firstEms, secondEms, Pair::KeepIdenticalValues);
CSSValue value3 = roundTrip(CSSPrimitiveValue::create(pairEms.release()), RangeNonNegative);
testPrimitiveValue(value3, 0, 0, CSSPrimitiveValue::CSS_EMS);
- RefPtrWillBeRawPtr<CSSPrimitiveValue> firstPcNeg = CSSPrimitiveValue::create(0, CSSPrimitiveValue::CSS_PERCENTAGE);
- RefPtrWillBeRawPtr<CSSPrimitiveValue> secondPcNeg = CSSPrimitiveValue::create(0, CSSPrimitiveValue::CSS_PERCENTAGE);
+ CSSPrimitiveValue firstPcNeg = CSSPrimitiveValue::create(0, CSSPrimitiveValue::CSS_PERCENTAGE);
+ CSSPrimitiveValue secondPcNeg = CSSPrimitiveValue::create(0, CSSPrimitiveValue::CSS_PERCENTAGE);
RefPtrWillBeRawPtr<Pair> pairPcNeg = Pair::create(firstPcNeg, secondPcNeg, Pair::KeepIdenticalValues);
CSSValue value4 = roundTrip(CSSPrimitiveValue::create(pairPcNeg.release()), RangeAll);
testPrimitiveValue(value4, 0, 0, CSSPrimitiveValue::CSS_PERCENTAGE);
@@ -76,14 +76,14 @@ TEST_F(LengthPairStyleInterpolationTest, ZeroTest)
TEST_F(LengthPairStyleInterpolationTest, MultipleValueTest)
{
- RefPtrWillBeRawPtr<CSSPrimitiveValue> firstPx = CSSPrimitiveValue::create(10, CSSPrimitiveValue::CSS_PX);
- RefPtrWillBeRawPtr<CSSPrimitiveValue> secondPx = CSSPrimitiveValue::create(20, CSSPrimitiveValue::CSS_PX);
+ CSSPrimitiveValue firstPx = CSSPrimitiveValue::create(10, CSSPrimitiveValue::CSS_PX);
+ CSSPrimitiveValue secondPx = CSSPrimitiveValue::create(20, CSSPrimitiveValue::CSS_PX);
RefPtrWillBeRawPtr<Pair> pairPx = Pair::create(firstPx, secondPx, Pair::KeepIdenticalValues);
CSSValue value5 = roundTrip(CSSPrimitiveValue::create(pairPx.release()), RangeNonNegative);
testPrimitiveValue(value5, 10, 20, CSSPrimitiveValue::CSS_PX);
- RefPtrWillBeRawPtr<CSSPrimitiveValue> firstPc = CSSPrimitiveValue::create(30, CSSPrimitiveValue::CSS_PERCENTAGE);
- RefPtrWillBeRawPtr<CSSPrimitiveValue> secondPc = CSSPrimitiveValue::create(-30, CSSPrimitiveValue::CSS_PERCENTAGE);
+ CSSPrimitiveValue firstPc = CSSPrimitiveValue::create(30, CSSPrimitiveValue::CSS_PERCENTAGE);
+ CSSPrimitiveValue secondPc = CSSPrimitiveValue::create(-30, CSSPrimitiveValue::CSS_PERCENTAGE);
RefPtrWillBeRawPtr<Pair> pairPc = Pair::create(firstPc, secondPc, Pair::KeepIdenticalValues);
CSSValue value6 = roundTrip(CSSPrimitiveValue::create(pairPc.release()), RangeNonNegative);
testPrimitiveValue(value6, 30, 0, CSSPrimitiveValue::CSS_PERCENTAGE);
« no previous file with comments | « Source/core/animation/LengthPairStyleInterpolation.cpp ('k') | Source/core/animation/LengthStyleInterpolation.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698