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

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

Issue 2050123002: Remove OwnPtr from Blink. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: First attempt to land. Created 4 years, 6 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: third_party/WebKit/Source/core/animation/InterpolableValueTest.cpp
diff --git a/third_party/WebKit/Source/core/animation/InterpolableValueTest.cpp b/third_party/WebKit/Source/core/animation/InterpolableValueTest.cpp
index b65d8255fca358de900160b4fc7b7cf518574b51..3b965884f9458c60ebc71a368f6bb7dc3b7738ec 100644
--- a/third_party/WebKit/Source/core/animation/InterpolableValueTest.cpp
+++ b/third_party/WebKit/Source/core/animation/InterpolableValueTest.cpp
@@ -7,6 +7,7 @@
#include "core/animation/Interpolation.h"
#include "core/animation/PropertyHandle.h"
#include "testing/gtest/include/gtest/gtest.h"
+#include <memory>
namespace blink {
@@ -14,7 +15,7 @@ namespace {
class SampleInterpolation : public Interpolation {
public:
- static PassRefPtr<Interpolation> create(PassOwnPtr<InterpolableValue> start, PassOwnPtr<InterpolableValue> end)
+ static PassRefPtr<Interpolation> create(std::unique_ptr<InterpolableValue> start, std::unique_ptr<InterpolableValue> end)
{
return adoptRef(new SampleInterpolation(std::move(start), std::move(end)));
}
@@ -24,7 +25,7 @@ public:
return PropertyHandle(CSSPropertyBackgroundColor);
}
private:
- SampleInterpolation(PassOwnPtr<InterpolableValue> start, PassOwnPtr<InterpolableValue> end)
+ SampleInterpolation(std::unique_ptr<InterpolableValue> start, std::unique_ptr<InterpolableValue> end)
: Interpolation(std::move(start), std::move(end))
{
}
@@ -58,7 +59,7 @@ protected:
base.scaleAndAdd(scale, add);
}
- PassRefPtr<Interpolation> interpolateLists(PassOwnPtr<InterpolableList> listA, PassOwnPtr<InterpolableList> listB, double progress)
+ PassRefPtr<Interpolation> interpolateLists(std::unique_ptr<InterpolableList> listA, std::unique_ptr<InterpolableList> listB, double progress)
{
RefPtr<Interpolation> i = SampleInterpolation::create(std::move(listA), std::move(listB));
i->interpolate(0, progress);
@@ -88,12 +89,12 @@ TEST_F(AnimationInterpolableValueTest, InterpolateBools)
TEST_F(AnimationInterpolableValueTest, SimpleList)
{
- OwnPtr<InterpolableList> listA = InterpolableList::create(3);
+ std::unique_ptr<InterpolableList> listA = InterpolableList::create(3);
listA->set(0, InterpolableNumber::create(0));
listA->set(1, InterpolableNumber::create(42));
listA->set(2, InterpolableNumber::create(20.5));
- OwnPtr<InterpolableList> listB = InterpolableList::create(3);
+ std::unique_ptr<InterpolableList> listB = InterpolableList::create(3);
listB->set(0, InterpolableNumber::create(100));
listB->set(1, InterpolableNumber::create(-200));
listB->set(2, InterpolableNumber::create(300));
@@ -107,16 +108,16 @@ TEST_F(AnimationInterpolableValueTest, SimpleList)
TEST_F(AnimationInterpolableValueTest, NestedList)
{
- OwnPtr<InterpolableList> listA = InterpolableList::create(3);
+ std::unique_ptr<InterpolableList> listA = InterpolableList::create(3);
listA->set(0, InterpolableNumber::create(0));
- OwnPtr<InterpolableList> subListA = InterpolableList::create(1);
+ std::unique_ptr<InterpolableList> subListA = InterpolableList::create(1);
subListA->set(0, InterpolableNumber::create(100));
listA->set(1, std::move(subListA));
listA->set(2, InterpolableBool::create(false));
- OwnPtr<InterpolableList> listB = InterpolableList::create(3);
+ std::unique_ptr<InterpolableList> listB = InterpolableList::create(3);
listB->set(0, InterpolableNumber::create(100));
- OwnPtr<InterpolableList> subListB = InterpolableList::create(1);
+ std::unique_ptr<InterpolableList> subListB = InterpolableList::create(1);
subListB->set(0, InterpolableNumber::create(50));
listB->set(1, std::move(subListB));
listB->set(2, InterpolableBool::create(true));
@@ -130,7 +131,7 @@ TEST_F(AnimationInterpolableValueTest, NestedList)
TEST_F(AnimationInterpolableValueTest, ScaleAndAddNumbers)
{
- OwnPtr<InterpolableNumber> base = InterpolableNumber::create(10);
+ std::unique_ptr<InterpolableNumber> base = InterpolableNumber::create(10);
scaleAndAdd(*base, 2, *InterpolableNumber::create(1));
EXPECT_FLOAT_EQ(21, base->value());
@@ -145,11 +146,11 @@ TEST_F(AnimationInterpolableValueTest, ScaleAndAddNumbers)
TEST_F(AnimationInterpolableValueTest, ScaleAndAddLists)
{
- OwnPtr<InterpolableList> baseList = InterpolableList::create(3);
+ std::unique_ptr<InterpolableList> baseList = InterpolableList::create(3);
baseList->set(0, InterpolableNumber::create(5));
baseList->set(1, InterpolableNumber::create(10));
baseList->set(2, InterpolableNumber::create(15));
- OwnPtr<InterpolableList> addList = InterpolableList::create(3);
+ std::unique_ptr<InterpolableList> addList = InterpolableList::create(3);
addList->set(0, InterpolableNumber::create(1));
addList->set(1, InterpolableNumber::create(2));
addList->set(2, InterpolableNumber::create(3));

Powered by Google App Engine
This is Rietveld 408576698