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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: cc/scrollbar_animation_controller_linear_fade_unittest.cc

Issue 12408028: cc: Delay start of scrollbar animation setNeedsRedraw. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase to 187970 and update test Created 7 years, 9 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
« cc/layer_tree_host_impl.h ('K') | « cc/scrollbar_animation_controller_linear_fade.cc ('k') | cc/single_thread_proxy.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 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 "cc/scrollbar_animation_controller_linear_fade.h" 5 #include "cc/scrollbar_animation_controller_linear_fade.h"
6 6
7 #include "cc/scrollbar_layer_impl.h" 7 #include "cc/scrollbar_layer_impl.h"
8 #include "cc/single_thread_proxy.h" 8 #include "cc/single_thread_proxy.h"
9 #include "cc/test/fake_impl_proxy.h" 9 #include "cc/test/fake_impl_proxy.h"
10 #include "cc/test/fake_layer_tree_host_impl.h" 10 #include "cc/test/fake_layer_tree_host_impl.h"
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 94
95 time += base::TimeDelta::FromSeconds(1); 95 time += base::TimeDelta::FromSeconds(1);
96 m_scrollbarController->animate(time); 96 m_scrollbarController->animate(time);
97 EXPECT_FLOAT_EQ(1.0f / 3.0f, m_scrollbarLayer->opacity()); 97 EXPECT_FLOAT_EQ(1.0f / 3.0f, m_scrollbarLayer->opacity());
98 98
99 time += base::TimeDelta::FromSeconds(1); 99 time += base::TimeDelta::FromSeconds(1);
100 m_scrollbarController->animate(time); 100 m_scrollbarController->animate(time);
101 EXPECT_FLOAT_EQ(0, m_scrollbarLayer->opacity()); 101 EXPECT_FLOAT_EQ(0, m_scrollbarLayer->opacity());
102 } 102 }
103 103
104 TEST_F(ScrollbarAnimationControllerLinearFadeTest, verifyForceAwakenByPinch) 104 TEST_F(ScrollbarAnimationControllerLinearFadeTest, verifyAwakenByPinch)
105 { 105 {
106 base::TimeTicks time; 106 base::TimeTicks time;
107 time += base::TimeDelta::FromSeconds(1);
107 m_scrollbarController->didPinchGestureUpdate(time); 108 m_scrollbarController->didPinchGestureUpdate(time);
108 m_scrollbarController->animate(time); 109 m_scrollbarController->animate(time);
109 EXPECT_FLOAT_EQ(1, m_scrollbarLayer->opacity()); 110 EXPECT_FLOAT_EQ(1, m_scrollbarLayer->opacity());
110 111
111 time += base::TimeDelta::FromSeconds(1);
112 m_scrollbarController->animate(time); 112 m_scrollbarController->animate(time);
113 EXPECT_FLOAT_EQ(1, m_scrollbarLayer->opacity()); 113 EXPECT_FLOAT_EQ(1, m_scrollbarLayer->opacity());
114 114
115 time += base::TimeDelta::FromSeconds(1); 115 time += base::TimeDelta::FromSeconds(1);
116 m_scrollbarController->animate(time); 116 m_scrollbarController->animate(time);
117 m_scrollbarController->didUpdateScrollOffset(time); 117 m_scrollbarController->didUpdateScrollOffset(time);
118 m_scrollbarController->animate(time); 118 m_scrollbarController->animate(time);
119 EXPECT_FLOAT_EQ(1, m_scrollbarLayer->opacity()); 119 EXPECT_FLOAT_EQ(1, m_scrollbarLayer->opacity());
120 120
121 time += base::TimeDelta::FromSeconds(1); 121 time += base::TimeDelta::FromSeconds(1);
122 m_scrollbarController->animate(time); 122 m_scrollbarController->animate(time);
123 EXPECT_FLOAT_EQ(1, m_scrollbarLayer->opacity()); 123 EXPECT_FLOAT_EQ(1, m_scrollbarLayer->opacity());
124 124
125 time += base::TimeDelta::FromSeconds(1); 125 time += base::TimeDelta::FromSeconds(1);
126 m_scrollbarController->animate(time); 126 m_scrollbarController->animate(time);
127 EXPECT_FLOAT_EQ(1, m_scrollbarLayer->opacity()); 127 EXPECT_FLOAT_EQ(1, m_scrollbarLayer->opacity());
128 128
129 time += base::TimeDelta::FromSeconds(1); 129 time += base::TimeDelta::FromSeconds(1);
130 m_scrollbarController->animate(time); 130 m_scrollbarController->animate(time);
131 EXPECT_FLOAT_EQ(1, m_scrollbarLayer->opacity()); 131 EXPECT_FLOAT_EQ(2 / 3.0f, m_scrollbarLayer->opacity());
132 132
133 time += base::TimeDelta::FromSeconds(1); 133 time += base::TimeDelta::FromSeconds(1);
134 m_scrollbarController->animate(time); 134 m_scrollbarController->animate(time);
135 EXPECT_FLOAT_EQ(1, m_scrollbarLayer->opacity()); 135 EXPECT_FLOAT_EQ(1 / 3.0f, m_scrollbarLayer->opacity());
136 136
137 time += base::TimeDelta::FromSeconds(1); 137 time += base::TimeDelta::FromSeconds(1);
138 m_scrollbarController->didPinchGestureEnd(time); 138 m_scrollbarController->didPinchGestureUpdate(time);
139 m_scrollbarController->animate(time); 139 m_scrollbarController->animate(time);
140 EXPECT_FLOAT_EQ(1, m_scrollbarLayer->opacity()); 140 EXPECT_FLOAT_EQ(1, m_scrollbarLayer->opacity());
141 141
142 time += base::TimeDelta::FromSeconds(1); 142 time += base::TimeDelta::FromSeconds(1);
143 m_scrollbarController->animate(time); 143 m_scrollbarController->animate(time);
144 EXPECT_FLOAT_EQ(1, m_scrollbarLayer->opacity()); 144 EXPECT_FLOAT_EQ(1, m_scrollbarLayer->opacity());
145 145
146 time += base::TimeDelta::FromSeconds(2); 146 time += base::TimeDelta::FromSeconds(2);
147 m_scrollbarController->animate(time); 147 m_scrollbarController->animate(time);
148 EXPECT_FLOAT_EQ(2 / 3.0f, m_scrollbarLayer->opacity()); 148 EXPECT_FLOAT_EQ(2 / 3.0f, m_scrollbarLayer->opacity());
149 149
150 time += base::TimeDelta::FromSeconds(1); 150 time += base::TimeDelta::FromSeconds(1);
151 m_scrollbarController->animate(time); 151 m_scrollbarController->animate(time);
152 EXPECT_FLOAT_EQ(1 / 3.0f, m_scrollbarLayer->opacity()); 152 EXPECT_FLOAT_EQ(1 / 3.0f, m_scrollbarLayer->opacity());
153 153
154 time += base::TimeDelta::FromSeconds(1); 154 time += base::TimeDelta::FromSeconds(1);
155 m_scrollbarController->animate(time); 155 m_scrollbarController->animate(time);
156 EXPECT_FLOAT_EQ(0, m_scrollbarLayer->opacity()); 156 EXPECT_FLOAT_EQ(0, m_scrollbarLayer->opacity());
157 157
158 } 158 }
159 159
160 } // namespace 160 } // namespace
161 } // namespace cc 161 } // namespace cc
OLDNEW
« cc/layer_tree_host_impl.h ('K') | « cc/scrollbar_animation_controller_linear_fade.cc ('k') | cc/single_thread_proxy.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698