Index: Source/core/animation/LengthBoxStyleInterpolationTest.cpp |
diff --git a/Source/core/animation/LengthBoxStyleInterpolationTest.cpp b/Source/core/animation/LengthBoxStyleInterpolationTest.cpp |
index ca8101992a5b8c2a4dd8909cdf42a3b488267376..e3c04d6bbead4c94fb146ec79f1dc115829f446c 100644 |
--- a/Source/core/animation/LengthBoxStyleInterpolationTest.cpp |
+++ b/Source/core/animation/LengthBoxStyleInterpolationTest.cpp |
@@ -21,17 +21,17 @@ protected: |
return LengthBoxStyleInterpolation::lengthBoxtoInterpolableValue(value, value, false); |
} |
- static PassRefPtrWillBeRawPtr<CSSValue> interpolableValueToLengthBox(InterpolableValue* value, const CSSValue& start, const CSSValue& end) |
+ static PassRefPtr<CSSValue> interpolableValueToLengthBox(InterpolableValue* value, const CSSValue& start, const CSSValue& end) |
{ |
return LengthBoxStyleInterpolation::interpolableValueToLengthBox(value, start, end); |
} |
- static PassRefPtrWillBeRawPtr<CSSValue> roundTrip(PassRefPtrWillBeRawPtr<CSSValue> value) |
+ static PassRefPtr<CSSValue> roundTrip(PassRefPtr<CSSValue> value) |
{ |
return interpolableValueToLengthBox(lengthBoxToInterpolableValue(*value).get(), *value, *value); |
} |
- static void testPrimitiveValue(RefPtrWillBeRawPtr<CSSValue> value, double left, double right, double top, double bottom, CSSPrimitiveValue::UnitType unitType) |
+ static void testPrimitiveValue(RefPtr<CSSValue> value, double left, double right, double top, double bottom, CSSPrimitiveValue::UnitType unitType) |
{ |
EXPECT_TRUE(value->isPrimitiveValue()); |
Rect* rect = toCSSPrimitiveValue(value.get())->getRectValue(); |
@@ -50,15 +50,15 @@ protected: |
TEST_F(AnimationLengthBoxStyleInterpolationTest, ZeroLengthBox) |
{ |
- RefPtrWillBeRawPtr<Rect> rectPx = Rect::create(); |
+ RefPtr<Rect> rectPx = Rect::create(); |
rectPx->setLeft(CSSPrimitiveValue::create(0, CSSPrimitiveValue::UnitType::Pixels)); |
rectPx->setRight(CSSPrimitiveValue::create(0, CSSPrimitiveValue::UnitType::Pixels)); |
rectPx->setTop(CSSPrimitiveValue::create(0, CSSPrimitiveValue::UnitType::Pixels)); |
rectPx->setBottom(CSSPrimitiveValue::create(0, CSSPrimitiveValue::UnitType::Pixels)); |
- RefPtrWillBeRawPtr<CSSValue> value = roundTrip(CSSPrimitiveValue::create(rectPx.release())); |
+ RefPtr<CSSValue> value = roundTrip(CSSPrimitiveValue::create(rectPx.release())); |
testPrimitiveValue(value, 0, 0, 0, 0, CSSPrimitiveValue::UnitType::Pixels); |
- RefPtrWillBeRawPtr<Rect> rectEms = Rect::create(); |
+ RefPtr<Rect> rectEms = Rect::create(); |
rectEms->setLeft(CSSPrimitiveValue::create(0, CSSPrimitiveValue::UnitType::Ems)); |
rectEms->setRight(CSSPrimitiveValue::create(0, CSSPrimitiveValue::UnitType::Ems)); |
rectEms->setTop(CSSPrimitiveValue::create(0, CSSPrimitiveValue::UnitType::Ems)); |
@@ -70,16 +70,16 @@ TEST_F(AnimationLengthBoxStyleInterpolationTest, ZeroLengthBox) |
TEST_F(AnimationLengthBoxStyleInterpolationTest, SingleUnitBox) |
{ |
- RefPtrWillBeRawPtr<Rect> rectPx = Rect::create(); |
+ RefPtr<Rect> rectPx = Rect::create(); |
rectPx->setLeft(CSSPrimitiveValue::create(10, CSSPrimitiveValue::UnitType::Pixels)); |
rectPx->setRight(CSSPrimitiveValue::create(10, CSSPrimitiveValue::UnitType::Pixels)); |
rectPx->setTop(CSSPrimitiveValue::create(10, CSSPrimitiveValue::UnitType::Pixels)); |
rectPx->setBottom(CSSPrimitiveValue::create(10, CSSPrimitiveValue::UnitType::Pixels)); |
- RefPtrWillBeRawPtr<CSSValue> value = roundTrip(CSSPrimitiveValue::create(rectPx.release())); |
+ RefPtr<CSSValue> value = roundTrip(CSSPrimitiveValue::create(rectPx.release())); |
testPrimitiveValue(value, 10, 10, 10, 10, CSSPrimitiveValue::UnitType::Pixels); |
- RefPtrWillBeRawPtr<Rect> rectPer = Rect::create(); |
+ RefPtr<Rect> rectPer = Rect::create(); |
rectPer->setLeft(CSSPrimitiveValue::create(30, CSSPrimitiveValue::UnitType::Percentage)); |
rectPer->setRight(CSSPrimitiveValue::create(30, CSSPrimitiveValue::UnitType::Percentage)); |
rectPer->setTop(CSSPrimitiveValue::create(30, CSSPrimitiveValue::UnitType::Percentage)); |
@@ -88,7 +88,7 @@ TEST_F(AnimationLengthBoxStyleInterpolationTest, SingleUnitBox) |
value = roundTrip(CSSPrimitiveValue::create(rectPer.release())); |
testPrimitiveValue(value, 30, 30, 30, 30, CSSPrimitiveValue::UnitType::Percentage); |
- RefPtrWillBeRawPtr<Rect> rectEms = Rect::create(); |
+ RefPtr<Rect> rectEms = Rect::create(); |
rectEms->setLeft(CSSPrimitiveValue::create(-10, CSSPrimitiveValue::UnitType::Ems)); |
rectEms->setRight(CSSPrimitiveValue::create(-10, CSSPrimitiveValue::UnitType::Ems)); |
rectEms->setTop(CSSPrimitiveValue::create(-10, CSSPrimitiveValue::UnitType::Ems)); |
@@ -100,16 +100,16 @@ TEST_F(AnimationLengthBoxStyleInterpolationTest, SingleUnitBox) |
TEST_F(AnimationLengthBoxStyleInterpolationTest, MultipleValues) |
{ |
- RefPtrWillBeRawPtr<Rect> rectPx = Rect::create(); |
+ RefPtr<Rect> rectPx = Rect::create(); |
rectPx->setLeft(CSSPrimitiveValue::create(10, CSSPrimitiveValue::UnitType::Pixels)); |
rectPx->setRight(CSSPrimitiveValue::create(0, CSSPrimitiveValue::UnitType::Pixels)); |
rectPx->setTop(CSSPrimitiveValue::create(20, CSSPrimitiveValue::UnitType::Pixels)); |
rectPx->setBottom(CSSPrimitiveValue::create(40, CSSPrimitiveValue::UnitType::Pixels)); |
- RefPtrWillBeRawPtr<CSSValue> value = roundTrip(CSSPrimitiveValue::create(rectPx.release())); |
+ RefPtr<CSSValue> value = roundTrip(CSSPrimitiveValue::create(rectPx.release())); |
testPrimitiveValue(value, 10, 0, 20, 40, CSSPrimitiveValue::UnitType::Pixels); |
- RefPtrWillBeRawPtr<Rect> rectPer = Rect::create(); |
+ RefPtr<Rect> rectPer = Rect::create(); |
rectPer->setLeft(CSSPrimitiveValue::create(30, CSSPrimitiveValue::UnitType::Percentage)); |
rectPer->setRight(CSSPrimitiveValue::create(-30, CSSPrimitiveValue::UnitType::Percentage)); |
rectPer->setTop(CSSPrimitiveValue::create(30, CSSPrimitiveValue::UnitType::Percentage)); |