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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1120003002: [Oilpan] Migrate most classes under core/animations to Oilpan heap. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Resize expect size of Persistent Created 5 years, 7 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
« Source/core/animation/AnimationTimeline.cpp ('K') | « Source/core/animation/InterpolableValue.cpp ('k') | Source/core/animation/Interpolation.h » ('j') | Source/core/animation/KeyframeEffect.h » ('J')
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 951ef40f784911746da47955f715807e77293390..8324063c395d830cf037d04f1962cb920b032a4b 100644
--- a/Source/core/animation/InterpolableValueTest.cpp
+++ b/Source/core/animation/InterpolableValueTest.cpp
@@ -16,9 +16,9 @@ namespace {
class SampleInterpolation : public Interpolation {
public:
- static PassRefPtrWillBeRawPtr<Interpolation> create(PassOwnPtrWillBeRawPtr<InterpolableValue> start, PassOwnPtrWillBeRawPtr<InterpolableValue> end)
+ static Interpolation* create(InterpolableValue* start, InterpolableValue* end)
{
- return adoptRefWillBeNoop(new SampleInterpolation(start, end));
+ return new SampleInterpolation(start, end);
}
virtual PropertyHandle property() const override
@@ -26,7 +26,7 @@ public:
return PropertyHandle(CSSPropertyBackgroundColor);
}
private:
- SampleInterpolation(PassOwnPtrWillBeRawPtr<InterpolableValue> start, PassOwnPtrWillBeRawPtr<InterpolableValue> end)
+ SampleInterpolation(InterpolableValue* start, InterpolableValue* end)
: Interpolation(start, end)
{
}
@@ -43,75 +43,75 @@ protected:
double interpolateNumbers(double a, double b, double progress)
{
- RefPtrWillBeRawPtr<Interpolation> i = SampleInterpolation::create(InterpolableNumber::create(a), InterpolableNumber::create(b));
+ Interpolation* i = SampleInterpolation::create(InterpolableNumber::create(a), InterpolableNumber::create(b));
i->interpolate(0, progress);
- return toInterpolableNumber(interpolationValue(*i.get()))->value();
+ return toInterpolableNumber(interpolationValue(*i))->value();
}
bool interpolateBools(bool a, bool b, double progress)
{
- RefPtrWillBeRawPtr<Interpolation> i = SampleInterpolation::create(InterpolableBool::create(a), InterpolableBool::create(b));
+ Interpolation* i = SampleInterpolation::create(InterpolableBool::create(a), InterpolableBool::create(b));
i->interpolate(0, progress);
- return toInterpolableBool(interpolationValue(*i.get()))->value();
+ return toInterpolableBool(interpolationValue(*i))->value();
}
- PassRefPtrWillBeRawPtr<Interpolation> interpolateLists(PassOwnPtrWillBeRawPtr<InterpolableList> listA, PassOwnPtrWillBeRawPtr<InterpolableList> listB, double progress)
+ Interpolation* interpolateLists(InterpolableList* listA, InterpolableList* listB, double progress)
{
- RefPtrWillBeRawPtr<Interpolation> i = SampleInterpolation::create(listA, listB);
+ Interpolation* i = SampleInterpolation::create(listA, listB);
i->interpolate(0, progress);
return i;
}
double addNumbers(double a, double b)
{
- OwnPtrWillBeRawPtr<InterpolableValue> numA = InterpolableNumber::create(a);
- OwnPtrWillBeRawPtr<InterpolableValue> numB = InterpolableNumber::create(b);
+ InterpolableValue* numA = InterpolableNumber::create(a);
+ InterpolableValue* numB = InterpolableNumber::create(b);
- OwnPtrWillBeRawPtr<InterpolableValue> resultNumber = InterpolableNumber::create(0);
+ InterpolableValue* resultNumber = InterpolableNumber::create(0);
numA->add(*numB, *resultNumber);
- return toInterpolableNumber(resultNumber.get())->value();
+ return toInterpolableNumber(resultNumber)->value();
}
bool addBools(bool a, bool b)
{
- OwnPtrWillBeRawPtr<InterpolableValue> boolA = InterpolableBool::create(a);
- OwnPtrWillBeRawPtr<InterpolableValue> boolB = InterpolableBool::create(b);
+ InterpolableValue* boolA = InterpolableBool::create(a);
+ InterpolableValue* boolB = InterpolableBool::create(b);
- OwnPtrWillBeRawPtr<InterpolableValue> resultBool = InterpolableBool::create(false);
+ InterpolableValue* resultBool = InterpolableBool::create(false);
boolA->add(*boolB, *resultBool);
- return toInterpolableBool(resultBool.get())->value();
+ return toInterpolableBool(resultBool)->value();
}
- PassOwnPtrWillBeRawPtr<InterpolableList> addLists(PassOwnPtrWillBeRawPtr<InterpolableValue> listA, PassOwnPtrWillBeRawPtr<InterpolableValue> listB)
+ InterpolableList* addLists(InterpolableValue* listA, InterpolableValue* listB)
{
- OwnPtrWillBeRawPtr<InterpolableList> result = InterpolableList::create(toInterpolableList(*listA));
+ InterpolableList* result = InterpolableList::create(toInterpolableList(*listA));
listA->add(*listB, *result);
- return result.release();
+ return result;
}
double multiplyNumber(double scalar, double n)
{
- OwnPtrWillBeRawPtr<InterpolableValue> num = InterpolableNumber::create(n);
- OwnPtrWillBeRawPtr<InterpolableValue> result = InterpolableNumber::create(0);
+ InterpolableValue* num = InterpolableNumber::create(n);
+ InterpolableValue* result = InterpolableNumber::create(0);
num->multiply(scalar, *result);
- return toInterpolableNumber(result.get())->value();
+ return toInterpolableNumber(result)->value();
}
- PassOwnPtrWillBeRawPtr<InterpolableList> multiplyList(double scalar, PassOwnPtrWillBeRawPtr<InterpolableValue> list)
+ InterpolableList* multiplyList(double scalar, InterpolableValue* list)
{
- OwnPtrWillBeRawPtr<InterpolableList> result = InterpolableList::create(toInterpolableList(*list));
+ InterpolableList* result = InterpolableList::create(toInterpolableList(*list));
list->multiply(scalar, *result);
- return result.release();
+ return result;
}
};
@@ -137,18 +137,18 @@ TEST_F(AnimationInterpolableValueTest, InterpolateBools)
TEST_F(AnimationInterpolableValueTest, SimpleList)
{
- OwnPtrWillBeRawPtr<InterpolableList> listA = InterpolableList::create(3);
+ 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);
+ InterpolableList* listB = InterpolableList::create(3);
listB->set(0, InterpolableNumber::create(100));
listB->set(1, InterpolableNumber::create(-200));
listB->set(2, InterpolableNumber::create(300));
- RefPtrWillBeRawPtr<Interpolation> i = interpolateLists(listA.release(), listB.release(), 0.3);
- InterpolableList* outList = toInterpolableList(interpolationValue(*i.get()));
+ Interpolation* i = interpolateLists(listA, listB, 0.3);
+ InterpolableList* outList = toInterpolableList(interpolationValue(*i));
EXPECT_FLOAT_EQ(30, toInterpolableNumber(outList->get(0))->value());
EXPECT_FLOAT_EQ(-30.6f, toInterpolableNumber(outList->get(1))->value());
EXPECT_FLOAT_EQ(104.35f, toInterpolableNumber(outList->get(2))->value());
@@ -156,22 +156,22 @@ TEST_F(AnimationInterpolableValueTest, SimpleList)
TEST_F(AnimationInterpolableValueTest, NestedList)
{
- OwnPtrWillBeRawPtr<InterpolableList> listA = InterpolableList::create(3);
+ InterpolableList* listA = InterpolableList::create(3);
listA->set(0, InterpolableNumber::create(0));
- OwnPtrWillBeRawPtr<InterpolableList> subListA = InterpolableList::create(1);
+ InterpolableList* subListA = InterpolableList::create(1);
subListA->set(0, InterpolableNumber::create(100));
- listA->set(1, subListA.release());
+ listA->set(1, subListA);
listA->set(2, InterpolableBool::create(false));
- OwnPtrWillBeRawPtr<InterpolableList> listB = InterpolableList::create(3);
+ InterpolableList* listB = InterpolableList::create(3);
listB->set(0, InterpolableNumber::create(100));
- OwnPtrWillBeRawPtr<InterpolableList> subListB = InterpolableList::create(1);
+ InterpolableList* subListB = InterpolableList::create(1);
subListB->set(0, InterpolableNumber::create(50));
- listB->set(1, subListB.release());
+ listB->set(1, subListB);
listB->set(2, InterpolableBool::create(true));
- RefPtrWillBeRawPtr<Interpolation> i = interpolateLists(listA.release(), listB.release(), 0.5);
- InterpolableList* outList = toInterpolableList(interpolationValue(*i.get()));
+ Interpolation* i = interpolateLists(listA, listB, 0.5);
+ InterpolableList* outList = toInterpolableList(interpolationValue(*i));
EXPECT_FLOAT_EQ(50, toInterpolableNumber(outList->get(0))->value());
EXPECT_FLOAT_EQ(75, toInterpolableNumber(toInterpolableList(outList->get(1))->get(0))->value());
EXPECT_TRUE(toInterpolableBool(outList->get(2))->value());
@@ -199,17 +199,17 @@ TEST_F(AnimationInterpolableValueTest, AddBools)
TEST_F(AnimationInterpolableValueTest, AddLists)
{
- OwnPtrWillBeRawPtr<InterpolableList> listA = InterpolableList::create(3);
+ InterpolableList* listA = InterpolableList::create(3);
listA->set(0, InterpolableNumber::create(31));
listA->set(1, InterpolableNumber::create(-20));
listA->set(2, InterpolableNumber::create(42));
- OwnPtrWillBeRawPtr<InterpolableList> listB = InterpolableList::create(3);
+ InterpolableList* listB = InterpolableList::create(3);
listB->set(0, InterpolableNumber::create(20));
listB->set(1, InterpolableNumber::create(43));
listB->set(2, InterpolableNumber::create(-60));
- OwnPtrWillBeRawPtr<InterpolableList> result = addLists(listA.release(), listB.release());
+ InterpolableList* result = addLists(listA, listB);
EXPECT_FLOAT_EQ(51, toInterpolableNumber(result->get(0))->value());
EXPECT_FLOAT_EQ(23, toInterpolableNumber(result->get(1))->value());
EXPECT_FLOAT_EQ(-18, toInterpolableNumber(result->get(2))->value());
@@ -217,21 +217,21 @@ TEST_F(AnimationInterpolableValueTest, AddLists)
TEST_F(AnimationInterpolableValueTest, AddNestedLists)
{
- OwnPtrWillBeRawPtr<InterpolableList> listA = InterpolableList::create(3);
+ InterpolableList* listA = InterpolableList::create(3);
listA->set(0, InterpolableNumber::create(19));
- OwnPtrWillBeRawPtr<InterpolableList> subListA = InterpolableList::create(1);
+ InterpolableList* subListA = InterpolableList::create(1);
subListA->set(0, InterpolableNumber::create(67));
- listA->set(1, subListA.release());
+ listA->set(1, subListA);
listA->set(2, InterpolableBool::create(false));
- OwnPtrWillBeRawPtr<InterpolableList> listB = InterpolableList::create(3);
+ InterpolableList* listB = InterpolableList::create(3);
listB->set(0, InterpolableNumber::create(21));
- OwnPtrWillBeRawPtr<InterpolableList> subListB = InterpolableList::create(1);
+ InterpolableList* subListB = InterpolableList::create(1);
subListB->set(0, InterpolableNumber::create(31));
- listB->set(1, subListB.release());
+ listB->set(1, subListB);
listB->set(2, InterpolableBool::create(true));
- OwnPtrWillBeRawPtr<InterpolableList> result = addLists(listA.release(), listB.release());
+ InterpolableList* result = addLists(listA, listB);
EXPECT_FLOAT_EQ(40, toInterpolableNumber(result->get(0))->value());
EXPECT_FLOAT_EQ(98, toInterpolableNumber(toInterpolableList(result->get(1))->get(0))->value());
EXPECT_TRUE(toInterpolableBool(result->get(2))->value());
@@ -250,26 +250,26 @@ TEST_F(AnimationInterpolableValueTest, NumberScalarMultiplication)
TEST_F(AnimationInterpolableValueTest, ListScalarMultiplication)
{
- OwnPtrWillBeRawPtr<InterpolableList> listA = InterpolableList::create(3);
+ InterpolableList* listA = InterpolableList::create(3);
listA->set(0, InterpolableNumber::create(5));
- OwnPtrWillBeRawPtr<InterpolableList> subListA = InterpolableList::create(2);
+ InterpolableList* subListA = InterpolableList::create(2);
subListA->set(0, InterpolableNumber::create(4));
subListA->set(1, InterpolableNumber::create(7));
- listA->set(1, subListA.release());
+ listA->set(1, subListA);
listA->set(2, InterpolableNumber::create(3));
- OwnPtrWillBeRawPtr<InterpolableList> resultA = multiplyList(6, listA.release());
+ InterpolableList* resultA = multiplyList(6, listA);
EXPECT_FLOAT_EQ(30, toInterpolableNumber(resultA->get(0))->value());
EXPECT_FLOAT_EQ(24, toInterpolableNumber(toInterpolableList(resultA->get(1))->get(0))->value());
EXPECT_FLOAT_EQ(42, toInterpolableNumber(toInterpolableList(resultA->get(1))->get(1))->value());
EXPECT_FLOAT_EQ(18, toInterpolableNumber(resultA->get(2))->value());
- OwnPtrWillBeRawPtr<InterpolableList> listB = InterpolableList::create(3);
+ InterpolableList* listB = InterpolableList::create(3);
listB->set(0, InterpolableNumber::create(8));
listB->set(1, InterpolableNumber::create(-10));
listB->set(2, InterpolableNumber::create(9));
- OwnPtrWillBeRawPtr<InterpolableList> resultB = multiplyList(0, listB.release());
+ InterpolableList* resultB = multiplyList(0, listB);
EXPECT_FLOAT_EQ(0, toInterpolableNumber(resultB->get(0))->value());
EXPECT_FLOAT_EQ(0, toInterpolableNumber(resultB->get(1))->value());
EXPECT_FLOAT_EQ(0, toInterpolableNumber(resultB->get(2))->value());
« Source/core/animation/AnimationTimeline.cpp ('K') | « Source/core/animation/InterpolableValue.cpp ('k') | Source/core/animation/Interpolation.h » ('j') | Source/core/animation/KeyframeEffect.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698