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

Side by Side Diff: cc/input/top_controls_manager_unittest.cc

Issue 12965007: Fix cpplint errors in cc/(animation|input|layers|trees|test)/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased Created 7 years, 8 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 | Annotate | Revision Log
« no previous file with comments | « cc/input/top_controls_manager.h ('k') | cc/layers/append_quads_data.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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/input/top_controls_manager.h" 5 #include "cc/input/top_controls_manager.h"
6 6
7 #include "base/memory/scoped_ptr.h" 7 #include "base/memory/scoped_ptr.h"
8 #include "base/time.h" 8 #include "base/time.h"
9 #include "cc/input/top_controls_manager_client.h" 9 #include "cc/input/top_controls_manager_client.h"
10 #include "cc/layers/layer_impl.h" 10 #include "cc/layers/layer_impl.h"
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 manager->ScrollBegin(); 129 manager->ScrollBegin();
130 manager->ScrollBy(gfx::Vector2dF(0.f, -15.f)); 130 manager->ScrollBy(gfx::Vector2dF(0.f, -15.f));
131 EXPECT_EQ(-85.f, manager->controls_top_offset()); 131 EXPECT_EQ(-85.f, manager->controls_top_offset());
132 EXPECT_EQ(15.f, manager->content_top_offset()); 132 EXPECT_EQ(15.f, manager->content_top_offset());
133 manager->ScrollEnd(); 133 manager->ScrollEnd();
134 134
135 EXPECT_TRUE(manager->animation()); 135 EXPECT_TRUE(manager->animation());
136 136
137 base::TimeTicks time = base::TimeTicks::Now(); 137 base::TimeTicks time = base::TimeTicks::Now();
138 float previous_offset = manager->controls_top_offset(); 138 float previous_offset = manager->controls_top_offset();
139 while(manager->animation()) { 139 while (manager->animation()) {
140 time = base::TimeDelta::FromMicroseconds(100) + time; 140 time = base::TimeDelta::FromMicroseconds(100) + time;
141 manager->Animate(time); 141 manager->Animate(time);
142 EXPECT_LT(manager->controls_top_offset(), previous_offset); 142 EXPECT_LT(manager->controls_top_offset(), previous_offset);
143 previous_offset = manager->controls_top_offset(); 143 previous_offset = manager->controls_top_offset();
144 } 144 }
145 EXPECT_FALSE(manager->animation()); 145 EXPECT_FALSE(manager->animation());
146 EXPECT_EQ(-100.f, manager->controls_top_offset()); 146 EXPECT_EQ(-100.f, manager->controls_top_offset());
147 EXPECT_EQ(0.f, manager->content_top_offset()); 147 EXPECT_EQ(0.f, manager->content_top_offset());
148 } 148 }
149 149
150 TEST(TopControlsManagerTest, PartialShownShowAnimation) { 150 TEST(TopControlsManagerTest, PartialShownShowAnimation) {
151 MockTopControlsManagerClient client(0.5f, 0.5f); 151 MockTopControlsManagerClient client(0.5f, 0.5f);
152 TopControlsManager* manager = client.manager(); 152 TopControlsManager* manager = client.manager();
153 manager->ScrollBegin(); 153 manager->ScrollBegin();
154 manager->ScrollBy(gfx::Vector2dF(0.f, 300.f)); 154 manager->ScrollBy(gfx::Vector2dF(0.f, 300.f));
155 EXPECT_EQ(-100.f, manager->controls_top_offset()); 155 EXPECT_EQ(-100.f, manager->controls_top_offset());
156 EXPECT_EQ(0.f, manager->content_top_offset()); 156 EXPECT_EQ(0.f, manager->content_top_offset());
157 manager->ScrollEnd(); 157 manager->ScrollEnd();
158 158
159 manager->ScrollBegin(); 159 manager->ScrollBegin();
160 manager->ScrollBy(gfx::Vector2dF(0.f, -70.f)); 160 manager->ScrollBy(gfx::Vector2dF(0.f, -70.f));
161 EXPECT_EQ(-30.f, manager->controls_top_offset()); 161 EXPECT_EQ(-30.f, manager->controls_top_offset());
162 EXPECT_EQ(70.f, manager->content_top_offset()); 162 EXPECT_EQ(70.f, manager->content_top_offset());
163 manager->ScrollEnd(); 163 manager->ScrollEnd();
164 164
165 EXPECT_TRUE(manager->animation()); 165 EXPECT_TRUE(manager->animation());
166 166
167 base::TimeTicks time = base::TimeTicks::Now(); 167 base::TimeTicks time = base::TimeTicks::Now();
168 float previous_offset = manager->controls_top_offset(); 168 float previous_offset = manager->controls_top_offset();
169 while(manager->animation()) { 169 while (manager->animation()) {
170 time = base::TimeDelta::FromMicroseconds(100) + time; 170 time = base::TimeDelta::FromMicroseconds(100) + time;
171 manager->Animate(time); 171 manager->Animate(time);
172 EXPECT_GT(manager->controls_top_offset(), previous_offset); 172 EXPECT_GT(manager->controls_top_offset(), previous_offset);
173 previous_offset = manager->controls_top_offset(); 173 previous_offset = manager->controls_top_offset();
174 } 174 }
175 EXPECT_FALSE(manager->animation()); 175 EXPECT_FALSE(manager->animation());
176 EXPECT_EQ(0.f, manager->controls_top_offset()); 176 EXPECT_EQ(0.f, manager->controls_top_offset());
177 EXPECT_EQ(100.f, manager->content_top_offset()); 177 EXPECT_EQ(100.f, manager->content_top_offset());
178 } 178 }
179 179
180 TEST(TopControlsManagerTest, PartialHiddenWithAmbiguousThresholdShows) { 180 TEST(TopControlsManagerTest, PartialHiddenWithAmbiguousThresholdShows) {
181 MockTopControlsManagerClient client(0.25f, 0.25f); 181 MockTopControlsManagerClient client(0.25f, 0.25f);
182 TopControlsManager* manager = client.manager(); 182 TopControlsManager* manager = client.manager();
183 183
184 manager->ScrollBegin(); 184 manager->ScrollBegin();
185 185
186 manager->ScrollBy(gfx::Vector2dF(0.f, 20.f)); 186 manager->ScrollBy(gfx::Vector2dF(0.f, 20.f));
187 EXPECT_EQ(-20.f, manager->controls_top_offset()); 187 EXPECT_EQ(-20.f, manager->controls_top_offset());
188 EXPECT_EQ(80.f, manager->content_top_offset()); 188 EXPECT_EQ(80.f, manager->content_top_offset());
189 189
190 manager->ScrollEnd(); 190 manager->ScrollEnd();
191 EXPECT_TRUE(manager->animation()); 191 EXPECT_TRUE(manager->animation());
192 192
193 base::TimeTicks time = base::TimeTicks::Now(); 193 base::TimeTicks time = base::TimeTicks::Now();
194 float previous_offset = manager->controls_top_offset(); 194 float previous_offset = manager->controls_top_offset();
195 while(manager->animation()) { 195 while (manager->animation()) {
196 time = base::TimeDelta::FromMicroseconds(100) + time; 196 time = base::TimeDelta::FromMicroseconds(100) + time;
197 manager->Animate(time); 197 manager->Animate(time);
198 EXPECT_GT(manager->controls_top_offset(), previous_offset); 198 EXPECT_GT(manager->controls_top_offset(), previous_offset);
199 previous_offset = manager->controls_top_offset(); 199 previous_offset = manager->controls_top_offset();
200 } 200 }
201 EXPECT_FALSE(manager->animation()); 201 EXPECT_FALSE(manager->animation());
202 EXPECT_EQ(0.f, manager->controls_top_offset()); 202 EXPECT_EQ(0.f, manager->controls_top_offset());
203 EXPECT_EQ(100.f, manager->content_top_offset()); 203 EXPECT_EQ(100.f, manager->content_top_offset());
204 } 204 }
205 205
206 TEST(TopControlsManagerTest, PartialHiddenWithAmbiguousThresholdHides) { 206 TEST(TopControlsManagerTest, PartialHiddenWithAmbiguousThresholdHides) {
207 MockTopControlsManagerClient client(0.25f, 0.25f); 207 MockTopControlsManagerClient client(0.25f, 0.25f);
208 TopControlsManager* manager = client.manager(); 208 TopControlsManager* manager = client.manager();
209 209
210 manager->ScrollBegin(); 210 manager->ScrollBegin();
211 211
212 manager->ScrollBy(gfx::Vector2dF(0.f, 30.f)); 212 manager->ScrollBy(gfx::Vector2dF(0.f, 30.f));
213 EXPECT_EQ(-30.f, manager->controls_top_offset()); 213 EXPECT_EQ(-30.f, manager->controls_top_offset());
214 EXPECT_EQ(70.f, manager->content_top_offset()); 214 EXPECT_EQ(70.f, manager->content_top_offset());
215 215
216 manager->ScrollEnd(); 216 manager->ScrollEnd();
217 EXPECT_TRUE(manager->animation()); 217 EXPECT_TRUE(manager->animation());
218 218
219 base::TimeTicks time = base::TimeTicks::Now(); 219 base::TimeTicks time = base::TimeTicks::Now();
220 float previous_offset = manager->controls_top_offset(); 220 float previous_offset = manager->controls_top_offset();
221 while(manager->animation()) { 221 while (manager->animation()) {
222 time = base::TimeDelta::FromMicroseconds(100) + time; 222 time = base::TimeDelta::FromMicroseconds(100) + time;
223 manager->Animate(time); 223 manager->Animate(time);
224 EXPECT_LT(manager->controls_top_offset(), previous_offset); 224 EXPECT_LT(manager->controls_top_offset(), previous_offset);
225 previous_offset = manager->controls_top_offset(); 225 previous_offset = manager->controls_top_offset();
226 } 226 }
227 EXPECT_FALSE(manager->animation()); 227 EXPECT_FALSE(manager->animation());
228 EXPECT_EQ(-100.f, manager->controls_top_offset()); 228 EXPECT_EQ(-100.f, manager->controls_top_offset());
229 EXPECT_EQ(0.f, manager->content_top_offset()); 229 EXPECT_EQ(0.f, manager->content_top_offset());
230 } 230 }
231 231
232 TEST(TopControlsManagerTest, PartialShownWithAmbiguousThresholdHides) { 232 TEST(TopControlsManagerTest, PartialShownWithAmbiguousThresholdHides) {
233 MockTopControlsManagerClient client(0.25f, 0.25f); 233 MockTopControlsManagerClient client(0.25f, 0.25f);
234 TopControlsManager* manager = client.manager(); 234 TopControlsManager* manager = client.manager();
235 235
236 manager->ScrollBy(gfx::Vector2dF(0.f, 200.f)); 236 manager->ScrollBy(gfx::Vector2dF(0.f, 200.f));
237 EXPECT_EQ(-100.f, manager->controls_top_offset()); 237 EXPECT_EQ(-100.f, manager->controls_top_offset());
238 EXPECT_EQ(0.f, manager->content_top_offset()); 238 EXPECT_EQ(0.f, manager->content_top_offset());
239 239
240 manager->ScrollBegin(); 240 manager->ScrollBegin();
241 241
242 manager->ScrollBy(gfx::Vector2dF(0.f, -20.f)); 242 manager->ScrollBy(gfx::Vector2dF(0.f, -20.f));
243 EXPECT_EQ(-80.f, manager->controls_top_offset()); 243 EXPECT_EQ(-80.f, manager->controls_top_offset());
244 EXPECT_EQ(20.f, manager->content_top_offset()); 244 EXPECT_EQ(20.f, manager->content_top_offset());
245 245
246 manager->ScrollEnd(); 246 manager->ScrollEnd();
247 EXPECT_TRUE(manager->animation()); 247 EXPECT_TRUE(manager->animation());
248 248
249 base::TimeTicks time = base::TimeTicks::Now(); 249 base::TimeTicks time = base::TimeTicks::Now();
250 float previous_offset = manager->controls_top_offset(); 250 float previous_offset = manager->controls_top_offset();
251 while(manager->animation()) { 251 while (manager->animation()) {
252 time = base::TimeDelta::FromMicroseconds(100) + time; 252 time = base::TimeDelta::FromMicroseconds(100) + time;
253 manager->Animate(time); 253 manager->Animate(time);
254 EXPECT_LT(manager->controls_top_offset(), previous_offset); 254 EXPECT_LT(manager->controls_top_offset(), previous_offset);
255 previous_offset = manager->controls_top_offset(); 255 previous_offset = manager->controls_top_offset();
256 } 256 }
257 EXPECT_FALSE(manager->animation()); 257 EXPECT_FALSE(manager->animation());
258 EXPECT_EQ(-100.f, manager->controls_top_offset()); 258 EXPECT_EQ(-100.f, manager->controls_top_offset());
259 EXPECT_EQ(0.f, manager->content_top_offset()); 259 EXPECT_EQ(0.f, manager->content_top_offset());
260 } 260 }
261 261
262 TEST(TopControlsManagerTest, PartialShownWithAmbiguousThresholdShows) { 262 TEST(TopControlsManagerTest, PartialShownWithAmbiguousThresholdShows) {
263 MockTopControlsManagerClient client(0.25f, 0.25f); 263 MockTopControlsManagerClient client(0.25f, 0.25f);
264 TopControlsManager* manager = client.manager(); 264 TopControlsManager* manager = client.manager();
265 265
266 manager->ScrollBy(gfx::Vector2dF(0.f, 200.f)); 266 manager->ScrollBy(gfx::Vector2dF(0.f, 200.f));
267 EXPECT_EQ(-100.f, manager->controls_top_offset()); 267 EXPECT_EQ(-100.f, manager->controls_top_offset());
268 EXPECT_EQ(0.f, manager->content_top_offset()); 268 EXPECT_EQ(0.f, manager->content_top_offset());
269 269
270 manager->ScrollBegin(); 270 manager->ScrollBegin();
271 271
272 manager->ScrollBy(gfx::Vector2dF(0.f, -30.f)); 272 manager->ScrollBy(gfx::Vector2dF(0.f, -30.f));
273 EXPECT_EQ(-70.f, manager->controls_top_offset()); 273 EXPECT_EQ(-70.f, manager->controls_top_offset());
274 EXPECT_EQ(30.f, manager->content_top_offset()); 274 EXPECT_EQ(30.f, manager->content_top_offset());
275 275
276 manager->ScrollEnd(); 276 manager->ScrollEnd();
277 EXPECT_TRUE(manager->animation()); 277 EXPECT_TRUE(manager->animation());
278 278
279 base::TimeTicks time = base::TimeTicks::Now(); 279 base::TimeTicks time = base::TimeTicks::Now();
280 float previous_offset = manager->controls_top_offset(); 280 float previous_offset = manager->controls_top_offset();
281 while(manager->animation()) { 281 while (manager->animation()) {
282 time = base::TimeDelta::FromMicroseconds(100) + time; 282 time = base::TimeDelta::FromMicroseconds(100) + time;
283 manager->Animate(time); 283 manager->Animate(time);
284 EXPECT_GT(manager->controls_top_offset(), previous_offset); 284 EXPECT_GT(manager->controls_top_offset(), previous_offset);
285 previous_offset = manager->controls_top_offset(); 285 previous_offset = manager->controls_top_offset();
286 } 286 }
287 EXPECT_FALSE(manager->animation()); 287 EXPECT_FALSE(manager->animation());
288 EXPECT_EQ(0.f, manager->controls_top_offset()); 288 EXPECT_EQ(0.f, manager->controls_top_offset());
289 EXPECT_EQ(100.f, manager->content_top_offset()); 289 EXPECT_EQ(100.f, manager->content_top_offset());
290 } 290 }
291 291
292 } // namespace 292 } // namespace
293 } // namespace cc 293 } // namespace cc
OLDNEW
« no previous file with comments | « cc/input/top_controls_manager.h ('k') | cc/layers/append_quads_data.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698