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

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

Issue 2236193002: WIP: Implement CSS transitions on top of InterpolationTypes instead of AnimatableValues (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@_environmentStyle
Patch Set: Created 4 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 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> 10 #include <memory>
11 11
12 namespace blink { 12 namespace blink {
13 13
14 namespace {
15
16 class SampleInterpolation : public Interpolation {
17 public:
18 static PassRefPtr<Interpolation> create(std::unique_ptr<InterpolableValue> s tart, std::unique_ptr<InterpolableValue> end)
19 {
20 return adoptRef(new SampleInterpolation(std::move(start), std::move(end) ));
21 }
22
23 PropertyHandle getProperty() const override
24 {
25 return PropertyHandle(CSSPropertyBackgroundColor);
26 }
27 private:
28 SampleInterpolation(std::unique_ptr<InterpolableValue> start, std::unique_pt r<InterpolableValue> end)
29 : Interpolation(std::move(start), std::move(end))
30 {
31 }
32 };
33
34 } // namespace
35
36 class AnimationInterpolableValueTest : public ::testing::Test { 14 class AnimationInterpolableValueTest : public ::testing::Test {
37 protected: 15 protected:
38 InterpolableValue* interpolationValue(Interpolation& interpolation) 16 std::unique_ptr<InterpolableValue> interpolate(std::unique_ptr<InterpolableV alue> a, std::unique_ptr<InterpolableValue> b, double progress)
39 { 17 {
40 return interpolation.getCachedValueForTesting(); 18 std::unique_ptr<InterpolableValue> result = a->clone();
19 a->interpolate(*b, progress, *result);
20 return result;
41 } 21 }
42 22
43 double interpolateNumbers(double a, double b, double progress) 23 double interpolateNumbers(double a, double b, double progress)
44 { 24 {
45 RefPtr<Interpolation> i = SampleInterpolation::create(InterpolableNumber ::create(a), InterpolableNumber::create(b)); 25 return toInterpolableNumber(*interpolate(InterpolableNumber::create(a), InterpolableNumber::create(b), progress)).value();
46 i->interpolate(0, progress);
47 return toInterpolableNumber(interpolationValue(*i.get()))->value();
48 } 26 }
49 27
50 bool interpolateBools(bool a, bool b, double progress) 28 bool interpolateBools(bool a, bool b, double progress)
51 { 29 {
52 RefPtr<Interpolation> i = SampleInterpolation::create(InterpolableBool:: create(a), InterpolableBool::create(b)); 30 return toInterpolableBool(*interpolate(InterpolableBool::create(a), Inte rpolableBool::create(b), progress)).value();
53 i->interpolate(0, progress);
54 return toInterpolableBool(interpolationValue(*i.get()))->value();
55 } 31 }
56 32
57 void scaleAndAdd(InterpolableValue& base, double scale, const InterpolableVa lue& add) 33 void scaleAndAdd(InterpolableValue& base, double scale, const InterpolableVa lue& add)
58 { 34 {
59 base.scaleAndAdd(scale, add); 35 base.scaleAndAdd(scale, add);
60 } 36 }
61
62 PassRefPtr<Interpolation> interpolateLists(std::unique_ptr<InterpolableList> listA, std::unique_ptr<InterpolableList> listB, double progress)
63 {
64 RefPtr<Interpolation> i = SampleInterpolation::create(std::move(listA), std::move(listB));
65 i->interpolate(0, progress);
66 return i;
67 }
68 }; 37 };
69 38
70 TEST_F(AnimationInterpolableValueTest, InterpolateNumbers) 39 TEST_F(AnimationInterpolableValueTest, InterpolateNumbers)
71 { 40 {
72 EXPECT_FLOAT_EQ(126, interpolateNumbers(42, 0, -2)); 41 EXPECT_FLOAT_EQ(126, interpolateNumbers(42, 0, -2));
73 EXPECT_FLOAT_EQ(42, interpolateNumbers(42, 0, 0)); 42 EXPECT_FLOAT_EQ(42, interpolateNumbers(42, 0, 0));
74 EXPECT_FLOAT_EQ(29.4f, interpolateNumbers(42, 0, 0.3)); 43 EXPECT_FLOAT_EQ(29.4f, interpolateNumbers(42, 0, 0.3));
75 EXPECT_FLOAT_EQ(21, interpolateNumbers(42, 0, 0.5)); 44 EXPECT_FLOAT_EQ(21, interpolateNumbers(42, 0, 0.5));
76 EXPECT_FLOAT_EQ(0, interpolateNumbers(42, 0, 1)); 45 EXPECT_FLOAT_EQ(0, interpolateNumbers(42, 0, 1));
77 EXPECT_FLOAT_EQ(-21, interpolateNumbers(42, 0, 1.5)); 46 EXPECT_FLOAT_EQ(-21, interpolateNumbers(42, 0, 1.5));
(...skipping 14 matching lines...) Expand all
92 std::unique_ptr<InterpolableList> listA = InterpolableList::create(3); 61 std::unique_ptr<InterpolableList> listA = InterpolableList::create(3);
93 listA->set(0, InterpolableNumber::create(0)); 62 listA->set(0, InterpolableNumber::create(0));
94 listA->set(1, InterpolableNumber::create(42)); 63 listA->set(1, InterpolableNumber::create(42));
95 listA->set(2, InterpolableNumber::create(20.5)); 64 listA->set(2, InterpolableNumber::create(20.5));
96 65
97 std::unique_ptr<InterpolableList> listB = InterpolableList::create(3); 66 std::unique_ptr<InterpolableList> listB = InterpolableList::create(3);
98 listB->set(0, InterpolableNumber::create(100)); 67 listB->set(0, InterpolableNumber::create(100));
99 listB->set(1, InterpolableNumber::create(-200)); 68 listB->set(1, InterpolableNumber::create(-200));
100 listB->set(2, InterpolableNumber::create(300)); 69 listB->set(2, InterpolableNumber::create(300));
101 70
102 RefPtr<Interpolation> i = interpolateLists(std::move(listA), std::move(listB ), 0.3); 71 std::unique_ptr<InterpolableValue> out = interpolate(std::move(listA), std:: move(listB), 0.3);
103 InterpolableList* outList = toInterpolableList(interpolationValue(*i.get())) ; 72 const InterpolableList& outList = toInterpolableList(*out);
104 EXPECT_FLOAT_EQ(30, toInterpolableNumber(outList->get(0))->value()); 73 EXPECT_FLOAT_EQ(30, toInterpolableNumber(outList.get(0))->value());
105 EXPECT_FLOAT_EQ(-30.6f, toInterpolableNumber(outList->get(1))->value()); 74 EXPECT_FLOAT_EQ(-30.6f, toInterpolableNumber(outList.get(1))->value());
106 EXPECT_FLOAT_EQ(104.35f, toInterpolableNumber(outList->get(2))->value()); 75 EXPECT_FLOAT_EQ(104.35f, toInterpolableNumber(outList.get(2))->value());
107 } 76 }
108 77
109 TEST_F(AnimationInterpolableValueTest, NestedList) 78 TEST_F(AnimationInterpolableValueTest, NestedList)
110 { 79 {
111 std::unique_ptr<InterpolableList> listA = InterpolableList::create(3); 80 std::unique_ptr<InterpolableList> listA = InterpolableList::create(3);
112 listA->set(0, InterpolableNumber::create(0)); 81 listA->set(0, InterpolableNumber::create(0));
113 std::unique_ptr<InterpolableList> subListA = InterpolableList::create(1); 82 std::unique_ptr<InterpolableList> subListA = InterpolableList::create(1);
114 subListA->set(0, InterpolableNumber::create(100)); 83 subListA->set(0, InterpolableNumber::create(100));
115 listA->set(1, std::move(subListA)); 84 listA->set(1, std::move(subListA));
116 listA->set(2, InterpolableBool::create(false)); 85 listA->set(2, InterpolableBool::create(false));
117 86
118 std::unique_ptr<InterpolableList> listB = InterpolableList::create(3); 87 std::unique_ptr<InterpolableList> listB = InterpolableList::create(3);
119 listB->set(0, InterpolableNumber::create(100)); 88 listB->set(0, InterpolableNumber::create(100));
120 std::unique_ptr<InterpolableList> subListB = InterpolableList::create(1); 89 std::unique_ptr<InterpolableList> subListB = InterpolableList::create(1);
121 subListB->set(0, InterpolableNumber::create(50)); 90 subListB->set(0, InterpolableNumber::create(50));
122 listB->set(1, std::move(subListB)); 91 listB->set(1, std::move(subListB));
123 listB->set(2, InterpolableBool::create(true)); 92 listB->set(2, InterpolableBool::create(true));
124 93
125 RefPtr<Interpolation> i = interpolateLists(std::move(listA), std::move(listB ), 0.5); 94 std::unique_ptr<InterpolableValue> out = interpolate(std::move(listA), std:: move(listB), 0.5);
126 InterpolableList* outList = toInterpolableList(interpolationValue(*i.get())) ; 95 const InterpolableList& outList = toInterpolableList(*out);
127 EXPECT_FLOAT_EQ(50, toInterpolableNumber(outList->get(0))->value()); 96 EXPECT_FLOAT_EQ(50, toInterpolableNumber(outList.get(0))->value());
128 EXPECT_FLOAT_EQ(75, toInterpolableNumber(toInterpolableList(outList->get(1)) ->get(0))->value()); 97 EXPECT_FLOAT_EQ(75, toInterpolableNumber(toInterpolableList(outList.get(1))- >get(0))->value());
129 EXPECT_TRUE(toInterpolableBool(outList->get(2))->value()); 98 EXPECT_TRUE(toInterpolableBool(outList.get(2))->value());
130 } 99 }
131 100
132 TEST_F(AnimationInterpolableValueTest, ScaleAndAddNumbers) 101 TEST_F(AnimationInterpolableValueTest, ScaleAndAddNumbers)
133 { 102 {
134 std::unique_ptr<InterpolableNumber> base = InterpolableNumber::create(10); 103 std::unique_ptr<InterpolableNumber> base = InterpolableNumber::create(10);
135 scaleAndAdd(*base, 2, *InterpolableNumber::create(1)); 104 scaleAndAdd(*base, 2, *InterpolableNumber::create(1));
136 EXPECT_FLOAT_EQ(21, base->value()); 105 EXPECT_FLOAT_EQ(21, base->value());
137 106
138 base = InterpolableNumber::create(10); 107 base = InterpolableNumber::create(10);
139 scaleAndAdd(*base, 0, *InterpolableNumber::create(5)); 108 scaleAndAdd(*base, 0, *InterpolableNumber::create(5));
(...skipping 14 matching lines...) Expand all
154 addList->set(0, InterpolableNumber::create(1)); 123 addList->set(0, InterpolableNumber::create(1));
155 addList->set(1, InterpolableNumber::create(2)); 124 addList->set(1, InterpolableNumber::create(2));
156 addList->set(2, InterpolableNumber::create(3)); 125 addList->set(2, InterpolableNumber::create(3));
157 scaleAndAdd(*baseList, 2, *addList); 126 scaleAndAdd(*baseList, 2, *addList);
158 EXPECT_FLOAT_EQ(11, toInterpolableNumber(baseList->get(0))->value()); 127 EXPECT_FLOAT_EQ(11, toInterpolableNumber(baseList->get(0))->value());
159 EXPECT_FLOAT_EQ(22, toInterpolableNumber(baseList->get(1))->value()); 128 EXPECT_FLOAT_EQ(22, toInterpolableNumber(baseList->get(1))->value());
160 EXPECT_FLOAT_EQ(33, toInterpolableNumber(baseList->get(2))->value()); 129 EXPECT_FLOAT_EQ(33, toInterpolableNumber(baseList->get(2))->value());
161 } 130 }
162 131
163 } // namespace blink 132 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/animation/InterpolableValue.h ('k') | third_party/WebKit/Source/core/animation/Interpolation.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698