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

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

Issue 1305383006: Oilpan: Unship CSSValues and AnimatableValues Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: 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
« no previous file with comments | « Source/core/animation/InterpolableValue.cpp ('k') | Source/core/animation/Interpolation.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/animation/InterpolableValueTest.cpp
diff --git a/Source/core/animation/InterpolableValueTest.cpp b/Source/core/animation/InterpolableValueTest.cpp
index de4b6d40c40eed2211f80abd83ace8c1c560c625..1e8ff32220c561fbfdbc3a4038a43088b6552b0d 100644
--- a/Source/core/animation/InterpolableValueTest.cpp
+++ b/Source/core/animation/InterpolableValueTest.cpp
@@ -16,7 +16,7 @@ namespace {
class SampleInterpolation : public Interpolation {
public:
- static PassRefPtrWillBeRawPtr<Interpolation> create(PassOwnPtrWillBeRawPtr<InterpolableValue> start, PassOwnPtrWillBeRawPtr<InterpolableValue> end)
+ static PassRefPtrWillBeRawPtr<Interpolation> create(PassOwnPtr<InterpolableValue> start, PassOwnPtr<InterpolableValue> end)
{
return adoptRefWillBeNoop(new SampleInterpolation(start, end));
}
@@ -26,7 +26,7 @@ public:
return PropertyHandle(CSSPropertyBackgroundColor);
}
private:
- SampleInterpolation(PassOwnPtrWillBeRawPtr<InterpolableValue> start, PassOwnPtrWillBeRawPtr<InterpolableValue> end)
+ SampleInterpolation(PassOwnPtr<InterpolableValue> start, PassOwnPtr<InterpolableValue> end)
: Interpolation(start, end)
{
}
@@ -60,7 +60,7 @@ protected:
base.scaleAndAdd(scale, add);
}
- PassRefPtrWillBeRawPtr<Interpolation> interpolateLists(PassOwnPtrWillBeRawPtr<InterpolableList> listA, PassOwnPtrWillBeRawPtr<InterpolableList> listB, double progress)
+ PassRefPtrWillBeRawPtr<Interpolation> interpolateLists(PassOwnPtr<InterpolableList> listA, PassOwnPtr<InterpolableList> listB, double progress)
{
RefPtrWillBeRawPtr<Interpolation> i = SampleInterpolation::create(listA, listB);
i->interpolate(0, progress);
@@ -90,12 +90,12 @@ TEST_F(AnimationInterpolableValueTest, InterpolateBools)
TEST_F(AnimationInterpolableValueTest, SimpleList)
{
- OwnPtrWillBeRawPtr<InterpolableList> listA = InterpolableList::create(3);
+ OwnPtr<InterpolableList> listA = InterpolableList::create(3);
listA->set(0, InterpolableNumber::create(0));
listA->set(1, InterpolableNumber::create(42));
listA->set(2, InterpolableNumber::create(20.5));
- OwnPtrWillBeRawPtr<InterpolableList> listB = InterpolableList::create(3);
+ OwnPtr<InterpolableList> listB = InterpolableList::create(3);
listB->set(0, InterpolableNumber::create(100));
listB->set(1, InterpolableNumber::create(-200));
listB->set(2, InterpolableNumber::create(300));
@@ -109,16 +109,16 @@ TEST_F(AnimationInterpolableValueTest, SimpleList)
TEST_F(AnimationInterpolableValueTest, NestedList)
{
- OwnPtrWillBeRawPtr<InterpolableList> listA = InterpolableList::create(3);
+ OwnPtr<InterpolableList> listA = InterpolableList::create(3);
listA->set(0, InterpolableNumber::create(0));
- OwnPtrWillBeRawPtr<InterpolableList> subListA = InterpolableList::create(1);
+ OwnPtr<InterpolableList> subListA = InterpolableList::create(1);
subListA->set(0, InterpolableNumber::create(100));
listA->set(1, subListA.release());
listA->set(2, InterpolableBool::create(false));
- OwnPtrWillBeRawPtr<InterpolableList> listB = InterpolableList::create(3);
+ OwnPtr<InterpolableList> listB = InterpolableList::create(3);
listB->set(0, InterpolableNumber::create(100));
- OwnPtrWillBeRawPtr<InterpolableList> subListB = InterpolableList::create(1);
+ OwnPtr<InterpolableList> subListB = InterpolableList::create(1);
subListB->set(0, InterpolableNumber::create(50));
listB->set(1, subListB.release());
listB->set(2, InterpolableBool::create(true));
@@ -132,7 +132,7 @@ TEST_F(AnimationInterpolableValueTest, NestedList)
TEST_F(AnimationInterpolableValueTest, ScaleAndAddNumbers)
{
- OwnPtrWillBeRawPtr<InterpolableNumber> base = InterpolableNumber::create(10);
+ OwnPtr<InterpolableNumber> base = InterpolableNumber::create(10);
scaleAndAdd(*base, 2, *InterpolableNumber::create(1));
EXPECT_FLOAT_EQ(21, base->value());
@@ -147,11 +147,11 @@ TEST_F(AnimationInterpolableValueTest, ScaleAndAddNumbers)
TEST_F(AnimationInterpolableValueTest, ScaleAndAddLists)
{
- OwnPtrWillBeRawPtr<InterpolableList> baseList = InterpolableList::create(3);
+ OwnPtr<InterpolableList> baseList = InterpolableList::create(3);
baseList->set(0, InterpolableNumber::create(5));
baseList->set(1, InterpolableNumber::create(10));
baseList->set(2, InterpolableNumber::create(15));
- OwnPtrWillBeRawPtr<InterpolableList> addList = InterpolableList::create(3);
+ OwnPtr<InterpolableList> addList = InterpolableList::create(3);
addList->set(0, InterpolableNumber::create(1));
addList->set(1, InterpolableNumber::create(2));
addList->set(2, InterpolableNumber::create(3));
« no previous file with comments | « Source/core/animation/InterpolableValue.cpp ('k') | Source/core/animation/Interpolation.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698