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

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

Issue 2442473002: Controls offsets computed if either top or bottom are showing (Closed)
Patch Set: remove duped logic Created 4 years, 1 month 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
« no previous file with comments | « cc/input/browser_controls_offset_manager.cc ('k') | no next file » | 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/browser_controls_offset_manager.h" 5 #include "cc/input/browser_controls_offset_manager.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cmath> 8 #include <cmath>
9 #include <memory> 9 #include <memory>
10 10
(...skipping 480 matching lines...) Expand 10 before | Expand all | Expand 10 after
491 EXPECT_FLOAT_EQ(0.8f, manager->BottomControlsShownRatio()); 491 EXPECT_FLOAT_EQ(0.8f, manager->BottomControlsShownRatio());
492 manager->ScrollEnd(); 492 manager->ScrollEnd();
493 493
494 manager->ScrollBegin(); 494 manager->ScrollBegin();
495 manager->ScrollBy(gfx::Vector2dF(0.f, -200.f)); 495 manager->ScrollBy(gfx::Vector2dF(0.f, -200.f));
496 EXPECT_FLOAT_EQ(100.f, manager->ContentBottomOffset()); 496 EXPECT_FLOAT_EQ(100.f, manager->ContentBottomOffset());
497 EXPECT_FLOAT_EQ(1.f, manager->BottomControlsShownRatio()); 497 EXPECT_FLOAT_EQ(1.f, manager->BottomControlsShownRatio());
498 manager->ScrollEnd(); 498 manager->ScrollEnd();
499 } 499 }
500 500
501 TEST(BrowserControlsOffsetManagerTest,
502 ScrollThenRestoreBottomControlsNoTopControls) {
503 MockBrowserControlsOffsetManagerClient client(0.f, 0.5f, 0.5f);
504 client.SetBottomControlsHeight(100.f);
505 BrowserControlsOffsetManager* manager = client.manager();
506 manager->ScrollBegin();
507 manager->ScrollBy(gfx::Vector2dF(0.f, 20.f));
508 EXPECT_FLOAT_EQ(80.f, manager->ContentBottomOffset());
509 EXPECT_FLOAT_EQ(0.8f, manager->BottomControlsShownRatio());
510 manager->ScrollEnd();
511
512 manager->ScrollBegin();
513 manager->ScrollBy(gfx::Vector2dF(0.f, -200.f));
514 EXPECT_FLOAT_EQ(100.f, manager->ContentBottomOffset());
515 EXPECT_FLOAT_EQ(1.f, manager->BottomControlsShownRatio());
516 manager->ScrollEnd();
517 }
518
501 TEST(BrowserControlsOffsetManagerTest, HideAndPeekBottomControls) { 519 TEST(BrowserControlsOffsetManagerTest, HideAndPeekBottomControls) {
502 MockBrowserControlsOffsetManagerClient client(100.f, 0.5f, 0.5f); 520 MockBrowserControlsOffsetManagerClient client(100.f, 0.5f, 0.5f);
503 client.SetBottomControlsHeight(100.f); 521 client.SetBottomControlsHeight(100.f);
504 BrowserControlsOffsetManager* manager = client.manager(); 522 BrowserControlsOffsetManager* manager = client.manager();
505 manager->ScrollBegin(); 523 manager->ScrollBegin();
506 manager->ScrollBy(gfx::Vector2dF(0.f, 300.f)); 524 manager->ScrollBy(gfx::Vector2dF(0.f, 300.f));
507 EXPECT_FLOAT_EQ(0.f, manager->ContentBottomOffset()); 525 EXPECT_FLOAT_EQ(0.f, manager->ContentBottomOffset());
508 EXPECT_FLOAT_EQ(0.f, manager->BottomControlsShownRatio()); 526 EXPECT_FLOAT_EQ(0.f, manager->BottomControlsShownRatio());
509 manager->ScrollEnd(); 527 manager->ScrollEnd();
510 528
(...skipping 15 matching lines...) Expand all
526 EXPECT_TRUE(manager->has_animation()); 544 EXPECT_TRUE(manager->has_animation());
527 EXPECT_FLOAT_EQ(1.f, client.CurrentBrowserControlsShownRatio()); 545 EXPECT_FLOAT_EQ(1.f, client.CurrentBrowserControlsShownRatio());
528 546
529 manager->UpdateBrowserControlsState(BOTH, SHOWN, true); 547 manager->UpdateBrowserControlsState(BOTH, SHOWN, true);
530 EXPECT_FALSE(manager->has_animation()); 548 EXPECT_FALSE(manager->has_animation());
531 EXPECT_FLOAT_EQ(1.f, client.CurrentBrowserControlsShownRatio()); 549 EXPECT_FLOAT_EQ(1.f, client.CurrentBrowserControlsShownRatio());
532 } 550 }
533 551
534 } // namespace 552 } // namespace
535 } // namespace cc 553 } // namespace cc
OLDNEW
« no previous file with comments | « cc/input/browser_controls_offset_manager.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698