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

Side by Side Diff: third_party/WebKit/Source/core/animation/InterpolableValueTest.cpp

Issue 2080623002: Revert "Remove OwnPtr from Blink." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "core/animation/InterpolableValue.h" 5 #include "core/animation/InterpolableValue.h"
6 6
7 #include "core/animation/Interpolation.h" 7 #include "core/animation/Interpolation.h"
8 #include "core/animation/PropertyHandle.h" 8 #include "core/animation/PropertyHandle.h"
9 #include "testing/gtest/include/gtest/gtest.h" 9 #include "testing/gtest/include/gtest/gtest.h"
10 #include <memory>
11 10
12 namespace blink { 11 namespace blink {
13 12
14 namespace { 13 namespace {
15 14
16 class SampleInterpolation : public Interpolation { 15 class SampleInterpolation : public Interpolation {
17 public: 16 public:
18 static PassRefPtr<Interpolation> create(std::unique_ptr<InterpolableValue> s tart, std::unique_ptr<InterpolableValue> end) 17 static PassRefPtr<Interpolation> create(PassOwnPtr<InterpolableValue> start, PassOwnPtr<InterpolableValue> end)
19 { 18 {
20 return adoptRef(new SampleInterpolation(std::move(start), std::move(end) )); 19 return adoptRef(new SampleInterpolation(std::move(start), std::move(end) ));
21 } 20 }
22 21
23 PropertyHandle getProperty() const override 22 PropertyHandle getProperty() const override
24 { 23 {
25 return PropertyHandle(CSSPropertyBackgroundColor); 24 return PropertyHandle(CSSPropertyBackgroundColor);
26 } 25 }
27 private: 26 private:
28 SampleInterpolation(std::unique_ptr<InterpolableValue> start, std::unique_pt r<InterpolableValue> end) 27 SampleInterpolation(PassOwnPtr<InterpolableValue> start, PassOwnPtr<Interpol ableValue> end)
29 : Interpolation(std::move(start), std::move(end)) 28 : Interpolation(std::move(start), std::move(end))
30 { 29 {
31 } 30 }
32 }; 31 };
33 32
34 } // namespace 33 } // namespace
35 34
36 class AnimationInterpolableValueTest : public ::testing::Test { 35 class AnimationInterpolableValueTest : public ::testing::Test {
37 protected: 36 protected:
38 InterpolableValue* interpolationValue(Interpolation& interpolation) 37 InterpolableValue* interpolationValue(Interpolation& interpolation)
(...skipping 13 matching lines...) Expand all
52 RefPtr<Interpolation> i = SampleInterpolation::create(InterpolableBool:: create(a), InterpolableBool::create(b)); 51 RefPtr<Interpolation> i = SampleInterpolation::create(InterpolableBool:: create(a), InterpolableBool::create(b));
53 i->interpolate(0, progress); 52 i->interpolate(0, progress);
54 return toInterpolableBool(interpolationValue(*i.get()))->value(); 53 return toInterpolableBool(interpolationValue(*i.get()))->value();
55 } 54 }
56 55
57 void scaleAndAdd(InterpolableValue& base, double scale, const InterpolableVa lue& add) 56 void scaleAndAdd(InterpolableValue& base, double scale, const InterpolableVa lue& add)
58 { 57 {
59 base.scaleAndAdd(scale, add); 58 base.scaleAndAdd(scale, add);
60 } 59 }
61 60
62 PassRefPtr<Interpolation> interpolateLists(std::unique_ptr<InterpolableList> listA, std::unique_ptr<InterpolableList> listB, double progress) 61 PassRefPtr<Interpolation> interpolateLists(PassOwnPtr<InterpolableList> list A, PassOwnPtr<InterpolableList> listB, double progress)
63 { 62 {
64 RefPtr<Interpolation> i = SampleInterpolation::create(std::move(listA), std::move(listB)); 63 RefPtr<Interpolation> i = SampleInterpolation::create(std::move(listA), std::move(listB));
65 i->interpolate(0, progress); 64 i->interpolate(0, progress);
66 return i; 65 return i;
67 } 66 }
68 }; 67 };
69 68
70 TEST_F(AnimationInterpolableValueTest, InterpolateNumbers) 69 TEST_F(AnimationInterpolableValueTest, InterpolateNumbers)
71 { 70 {
72 EXPECT_FLOAT_EQ(126, interpolateNumbers(42, 0, -2)); 71 EXPECT_FLOAT_EQ(126, interpolateNumbers(42, 0, -2));
73 EXPECT_FLOAT_EQ(42, interpolateNumbers(42, 0, 0)); 72 EXPECT_FLOAT_EQ(42, interpolateNumbers(42, 0, 0));
74 EXPECT_FLOAT_EQ(29.4f, interpolateNumbers(42, 0, 0.3)); 73 EXPECT_FLOAT_EQ(29.4f, interpolateNumbers(42, 0, 0.3));
75 EXPECT_FLOAT_EQ(21, interpolateNumbers(42, 0, 0.5)); 74 EXPECT_FLOAT_EQ(21, interpolateNumbers(42, 0, 0.5));
76 EXPECT_FLOAT_EQ(0, interpolateNumbers(42, 0, 1)); 75 EXPECT_FLOAT_EQ(0, interpolateNumbers(42, 0, 1));
77 EXPECT_FLOAT_EQ(-21, interpolateNumbers(42, 0, 1.5)); 76 EXPECT_FLOAT_EQ(-21, interpolateNumbers(42, 0, 1.5));
78 } 77 }
79 78
80 TEST_F(AnimationInterpolableValueTest, InterpolateBools) 79 TEST_F(AnimationInterpolableValueTest, InterpolateBools)
81 { 80 {
82 EXPECT_FALSE(interpolateBools(false, true, -1)); 81 EXPECT_FALSE(interpolateBools(false, true, -1));
83 EXPECT_FALSE(interpolateBools(false, true, 0)); 82 EXPECT_FALSE(interpolateBools(false, true, 0));
84 EXPECT_FALSE(interpolateBools(false, true, 0.3)); 83 EXPECT_FALSE(interpolateBools(false, true, 0.3));
85 EXPECT_TRUE(interpolateBools(false, true, 0.5)); 84 EXPECT_TRUE(interpolateBools(false, true, 0.5));
86 EXPECT_TRUE(interpolateBools(false, true, 1)); 85 EXPECT_TRUE(interpolateBools(false, true, 1));
87 EXPECT_TRUE(interpolateBools(false, true, 2)); 86 EXPECT_TRUE(interpolateBools(false, true, 2));
88 } 87 }
89 88
90 TEST_F(AnimationInterpolableValueTest, SimpleList) 89 TEST_F(AnimationInterpolableValueTest, SimpleList)
91 { 90 {
92 std::unique_ptr<InterpolableList> listA = InterpolableList::create(3); 91 OwnPtr<InterpolableList> listA = InterpolableList::create(3);
93 listA->set(0, InterpolableNumber::create(0)); 92 listA->set(0, InterpolableNumber::create(0));
94 listA->set(1, InterpolableNumber::create(42)); 93 listA->set(1, InterpolableNumber::create(42));
95 listA->set(2, InterpolableNumber::create(20.5)); 94 listA->set(2, InterpolableNumber::create(20.5));
96 95
97 std::unique_ptr<InterpolableList> listB = InterpolableList::create(3); 96 OwnPtr<InterpolableList> listB = InterpolableList::create(3);
98 listB->set(0, InterpolableNumber::create(100)); 97 listB->set(0, InterpolableNumber::create(100));
99 listB->set(1, InterpolableNumber::create(-200)); 98 listB->set(1, InterpolableNumber::create(-200));
100 listB->set(2, InterpolableNumber::create(300)); 99 listB->set(2, InterpolableNumber::create(300));
101 100
102 RefPtr<Interpolation> i = interpolateLists(std::move(listA), std::move(listB ), 0.3); 101 RefPtr<Interpolation> i = interpolateLists(std::move(listA), std::move(listB ), 0.3);
103 InterpolableList* outList = toInterpolableList(interpolationValue(*i.get())) ; 102 InterpolableList* outList = toInterpolableList(interpolationValue(*i.get())) ;
104 EXPECT_FLOAT_EQ(30, toInterpolableNumber(outList->get(0))->value()); 103 EXPECT_FLOAT_EQ(30, toInterpolableNumber(outList->get(0))->value());
105 EXPECT_FLOAT_EQ(-30.6f, toInterpolableNumber(outList->get(1))->value()); 104 EXPECT_FLOAT_EQ(-30.6f, toInterpolableNumber(outList->get(1))->value());
106 EXPECT_FLOAT_EQ(104.35f, toInterpolableNumber(outList->get(2))->value()); 105 EXPECT_FLOAT_EQ(104.35f, toInterpolableNumber(outList->get(2))->value());
107 } 106 }
108 107
109 TEST_F(AnimationInterpolableValueTest, NestedList) 108 TEST_F(AnimationInterpolableValueTest, NestedList)
110 { 109 {
111 std::unique_ptr<InterpolableList> listA = InterpolableList::create(3); 110 OwnPtr<InterpolableList> listA = InterpolableList::create(3);
112 listA->set(0, InterpolableNumber::create(0)); 111 listA->set(0, InterpolableNumber::create(0));
113 std::unique_ptr<InterpolableList> subListA = InterpolableList::create(1); 112 OwnPtr<InterpolableList> subListA = InterpolableList::create(1);
114 subListA->set(0, InterpolableNumber::create(100)); 113 subListA->set(0, InterpolableNumber::create(100));
115 listA->set(1, std::move(subListA)); 114 listA->set(1, std::move(subListA));
116 listA->set(2, InterpolableBool::create(false)); 115 listA->set(2, InterpolableBool::create(false));
117 116
118 std::unique_ptr<InterpolableList> listB = InterpolableList::create(3); 117 OwnPtr<InterpolableList> listB = InterpolableList::create(3);
119 listB->set(0, InterpolableNumber::create(100)); 118 listB->set(0, InterpolableNumber::create(100));
120 std::unique_ptr<InterpolableList> subListB = InterpolableList::create(1); 119 OwnPtr<InterpolableList> subListB = InterpolableList::create(1);
121 subListB->set(0, InterpolableNumber::create(50)); 120 subListB->set(0, InterpolableNumber::create(50));
122 listB->set(1, std::move(subListB)); 121 listB->set(1, std::move(subListB));
123 listB->set(2, InterpolableBool::create(true)); 122 listB->set(2, InterpolableBool::create(true));
124 123
125 RefPtr<Interpolation> i = interpolateLists(std::move(listA), std::move(listB ), 0.5); 124 RefPtr<Interpolation> i = interpolateLists(std::move(listA), std::move(listB ), 0.5);
126 InterpolableList* outList = toInterpolableList(interpolationValue(*i.get())) ; 125 InterpolableList* outList = toInterpolableList(interpolationValue(*i.get())) ;
127 EXPECT_FLOAT_EQ(50, toInterpolableNumber(outList->get(0))->value()); 126 EXPECT_FLOAT_EQ(50, toInterpolableNumber(outList->get(0))->value());
128 EXPECT_FLOAT_EQ(75, toInterpolableNumber(toInterpolableList(outList->get(1)) ->get(0))->value()); 127 EXPECT_FLOAT_EQ(75, toInterpolableNumber(toInterpolableList(outList->get(1)) ->get(0))->value());
129 EXPECT_TRUE(toInterpolableBool(outList->get(2))->value()); 128 EXPECT_TRUE(toInterpolableBool(outList->get(2))->value());
130 } 129 }
131 130
132 TEST_F(AnimationInterpolableValueTest, ScaleAndAddNumbers) 131 TEST_F(AnimationInterpolableValueTest, ScaleAndAddNumbers)
133 { 132 {
134 std::unique_ptr<InterpolableNumber> base = InterpolableNumber::create(10); 133 OwnPtr<InterpolableNumber> base = InterpolableNumber::create(10);
135 scaleAndAdd(*base, 2, *InterpolableNumber::create(1)); 134 scaleAndAdd(*base, 2, *InterpolableNumber::create(1));
136 EXPECT_FLOAT_EQ(21, base->value()); 135 EXPECT_FLOAT_EQ(21, base->value());
137 136
138 base = InterpolableNumber::create(10); 137 base = InterpolableNumber::create(10);
139 scaleAndAdd(*base, 0, *InterpolableNumber::create(5)); 138 scaleAndAdd(*base, 0, *InterpolableNumber::create(5));
140 EXPECT_FLOAT_EQ(5, base->value()); 139 EXPECT_FLOAT_EQ(5, base->value());
141 140
142 base = InterpolableNumber::create(10); 141 base = InterpolableNumber::create(10);
143 scaleAndAdd(*base, -1, *InterpolableNumber::create(8)); 142 scaleAndAdd(*base, -1, *InterpolableNumber::create(8));
144 EXPECT_FLOAT_EQ(-2, base->value()); 143 EXPECT_FLOAT_EQ(-2, base->value());
145 } 144 }
146 145
147 TEST_F(AnimationInterpolableValueTest, ScaleAndAddLists) 146 TEST_F(AnimationInterpolableValueTest, ScaleAndAddLists)
148 { 147 {
149 std::unique_ptr<InterpolableList> baseList = InterpolableList::create(3); 148 OwnPtr<InterpolableList> baseList = InterpolableList::create(3);
150 baseList->set(0, InterpolableNumber::create(5)); 149 baseList->set(0, InterpolableNumber::create(5));
151 baseList->set(1, InterpolableNumber::create(10)); 150 baseList->set(1, InterpolableNumber::create(10));
152 baseList->set(2, InterpolableNumber::create(15)); 151 baseList->set(2, InterpolableNumber::create(15));
153 std::unique_ptr<InterpolableList> addList = InterpolableList::create(3); 152 OwnPtr<InterpolableList> addList = InterpolableList::create(3);
154 addList->set(0, InterpolableNumber::create(1)); 153 addList->set(0, InterpolableNumber::create(1));
155 addList->set(1, InterpolableNumber::create(2)); 154 addList->set(1, InterpolableNumber::create(2));
156 addList->set(2, InterpolableNumber::create(3)); 155 addList->set(2, InterpolableNumber::create(3));
157 scaleAndAdd(*baseList, 2, *addList); 156 scaleAndAdd(*baseList, 2, *addList);
158 EXPECT_FLOAT_EQ(11, toInterpolableNumber(baseList->get(0))->value()); 157 EXPECT_FLOAT_EQ(11, toInterpolableNumber(baseList->get(0))->value());
159 EXPECT_FLOAT_EQ(22, toInterpolableNumber(baseList->get(1))->value()); 158 EXPECT_FLOAT_EQ(22, toInterpolableNumber(baseList->get(1))->value());
160 EXPECT_FLOAT_EQ(33, toInterpolableNumber(baseList->get(2))->value()); 159 EXPECT_FLOAT_EQ(33, toInterpolableNumber(baseList->get(2))->value());
161 } 160 }
162 161
163 } // namespace blink 162 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698