| Index: Source/core/animation/ListStyleInterpolationTest.cpp
|
| diff --git a/Source/core/animation/ListStyleInterpolationTest.cpp b/Source/core/animation/ListStyleInterpolationTest.cpp
|
| index 0123d87ee04546d2fdd4d133c9af6ec701724283..3c7b1c2cd59096b7d5bc3e3aef468e6b0826b62d 100644
|
| --- a/Source/core/animation/ListStyleInterpolationTest.cpp
|
| +++ b/Source/core/animation/ListStyleInterpolationTest.cpp
|
| @@ -15,13 +15,13 @@ namespace blink {
|
| class ListStyleInterpolationTest : public ::testing::Test {
|
|
|
| protected:
|
| - static PassRefPtrWillBeRawPtr<CSSValue> lengthRoundTrip(PassRefPtrWillBeRawPtr<CSSValue> value, InterpolationRange range)
|
| + static PassRefPtr<CSSValue> lengthRoundTrip(PassRefPtr<CSSValue> value, InterpolationRange range)
|
| {
|
| return ListStyleInterpolationImpl<LengthStyleInterpolation, void>::interpolableValueToList(
|
| ListStyleInterpolationImpl<LengthStyleInterpolation, void>::listToInterpolableValue(*value).get(), range);
|
| }
|
|
|
| - static void compareLengthLists(PassRefPtrWillBeRawPtr<CSSValueList> expectedList, PassRefPtrWillBeRawPtr<CSSValue> actualList)
|
| + static void compareLengthLists(PassRefPtr<CSSValueList> expectedList, PassRefPtr<CSSValue> actualList)
|
| {
|
| ASSERT(actualList->isValueList());
|
|
|
| @@ -36,26 +36,26 @@ protected:
|
| }
|
| }
|
|
|
| - static PassRefPtrWillBeRawPtr<CSSValue> shadowRoundTrip(PassRefPtrWillBeRawPtr<CSSValue> value)
|
| + static PassRefPtr<CSSValue> shadowRoundTrip(PassRefPtr<CSSValue> value)
|
| {
|
| Vector<bool> nonInterpolableData;
|
| return ListStyleInterpolationImpl<ShadowStyleInterpolation, bool>::interpolableValueToList(
|
| ListStyleInterpolationImpl<ShadowStyleInterpolation, bool>::listToInterpolableValue(*value, &nonInterpolableData).get(), nonInterpolableData);
|
| }
|
|
|
| - static RefPtrWillBeRawPtr<CSSShadowValue> createShadowValue()
|
| + static RefPtr<CSSShadowValue> createShadowValue()
|
| {
|
| - RefPtrWillBeRawPtr<CSSPrimitiveValue> color = CSSPrimitiveValue::createColor(makeRGBA(112, 123, 175, 255));
|
| - RefPtrWillBeRawPtr<CSSPrimitiveValue> x = CSSPrimitiveValue::create(10, CSSPrimitiveValue::UnitType::Pixels);
|
| - RefPtrWillBeRawPtr<CSSPrimitiveValue> y = CSSPrimitiveValue::create(20, CSSPrimitiveValue::UnitType::Pixels);
|
| - RefPtrWillBeRawPtr<CSSPrimitiveValue> blur = CSSPrimitiveValue::create(30, CSSPrimitiveValue::UnitType::Pixels);
|
| - RefPtrWillBeRawPtr<CSSPrimitiveValue> spread = CSSPrimitiveValue::create(40, CSSPrimitiveValue::UnitType::Pixels);
|
| + RefPtr<CSSPrimitiveValue> color = CSSPrimitiveValue::createColor(makeRGBA(112, 123, 175, 255));
|
| + RefPtr<CSSPrimitiveValue> x = CSSPrimitiveValue::create(10, CSSPrimitiveValue::UnitType::Pixels);
|
| + RefPtr<CSSPrimitiveValue> y = CSSPrimitiveValue::create(20, CSSPrimitiveValue::UnitType::Pixels);
|
| + RefPtr<CSSPrimitiveValue> blur = CSSPrimitiveValue::create(30, CSSPrimitiveValue::UnitType::Pixels);
|
| + RefPtr<CSSPrimitiveValue> spread = CSSPrimitiveValue::create(40, CSSPrimitiveValue::UnitType::Pixels);
|
|
|
| return CSSShadowValue::create(x, y, blur, spread, CSSPrimitiveValue::createIdentifier(CSSValueNone), color);
|
|
|
| }
|
|
|
| - static void compareShadowList(RefPtrWillBeRawPtr<CSSValueList> expectedList, RefPtrWillBeRawPtr<CSSValue> actualList)
|
| + static void compareShadowList(RefPtr<CSSValueList> expectedList, RefPtr<CSSValue> actualList)
|
| {
|
| ASSERT(actualList->isValueList());
|
|
|
| @@ -77,9 +77,9 @@ protected:
|
|
|
| TEST_F(ListStyleInterpolationTest, LengthListMultipleValuesTest)
|
| {
|
| - RefPtrWillBeRawPtr<CSSValueList> expectedList = CSSValueList::createCommaSeparated();
|
| + RefPtr<CSSValueList> expectedList = CSSValueList::createCommaSeparated();
|
| for (size_t i = 0; i < 10; i++) {
|
| - RefPtrWillBeRawPtr<CSSPrimitiveValue> lengthValue = CSSPrimitiveValue::create(static_cast<double>(i), CSSPrimitiveValue::UnitType::Pixels);
|
| + RefPtr<CSSPrimitiveValue> lengthValue = CSSPrimitiveValue::create(static_cast<double>(i), CSSPrimitiveValue::UnitType::Pixels);
|
| expectedList->append(lengthValue);
|
| }
|
|
|
| @@ -88,8 +88,8 @@ TEST_F(ListStyleInterpolationTest, LengthListMultipleValuesTest)
|
|
|
| TEST_F(ListStyleInterpolationTest, ShadowListMultipleValuesTest)
|
| {
|
| - RefPtrWillBeRawPtr<CSSValueList> expectedList = CSSValueList::createCommaSeparated();
|
| - RefPtrWillBeRawPtr<CSSShadowValue> shadowValue = createShadowValue();
|
| + RefPtr<CSSValueList> expectedList = CSSValueList::createCommaSeparated();
|
| + RefPtr<CSSShadowValue> shadowValue = createShadowValue();
|
| for (size_t i = 0; i < 10; i++) {
|
| expectedList->append(shadowValue);
|
| }
|
|
|