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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: cc/input/browser_controls_offset_manager_unittest.cc

Issue 2443613002: Rename classes related to top controls (Closed)
Patch Set: Created 4 years, 2 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 side-by-side diff with in-line comments
Download patch
« cc/input/browser_controls_offset_manager_client.h ('K') | « cc/input/browser_controls_offset_manager_client.h ('k') | cc/input/browser_controls_state.h » ('j') | cc/test/fake_proxy.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/input/browser_controls_offset_manager_unittest.cc
diff --git a/cc/input/top_controls_manager_unittest.cc b/cc/input/browser_controls_offset_manager_unittest.cc
similarity index 78%
rename from cc/input/top_controls_manager_unittest.cc
rename to cc/input/browser_controls_offset_manager_unittest.cc
index f58f9985921539cb3332c9f96c72adfa0220408f..773a753c103a8336a1e806b60c35654b93caf370 100644
--- a/cc/input/top_controls_manager_unittest.cc
+++ b/cc/input/browser_controls_offset_manager_unittest.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "cc/input/top_controls_manager.h"
+#include "cc/input/browser_controls_offset_manager.h"
#include <algorithm>
#include <cmath>
@@ -10,7 +10,7 @@
#include "base/logging.h"
#include "base/time/time.h"
-#include "cc/input/top_controls_manager_client.h"
+#include "cc/input/browser_controls_offset_manager_client.h"
#include "cc/layers/layer_impl.h"
#include "cc/test/fake_impl_task_runner_provider.h"
#include "cc/test/fake_layer_tree_host_impl.h"
@@ -23,11 +23,12 @@
namespace cc {
namespace {
-class MockTopControlsManagerClient : public TopControlsManagerClient {
+class MockBrowserControlsOffsetManagerClient
+ : public BrowserControlsOffsetManagerClient {
public:
- MockTopControlsManagerClient(float top_controls_height,
- float top_controls_show_threshold,
- float top_controls_hide_threshold)
+ MockBrowserControlsOffsetManagerClient(float top_controls_height,
+ float top_controls_show_threshold,
+ float top_controls_hide_threshold)
: host_impl_(&task_runner_provider_,
&shared_bitmap_manager_,
&task_graph_runner_),
@@ -44,7 +45,7 @@ class MockTopControlsManagerClient : public TopControlsManagerClient {
root_scroll_layer_ = LayerImpl::Create(active_tree_.get(), 1);
}
- ~MockTopControlsManagerClient() override {}
+ ~MockBrowserControlsOffsetManagerClient() override {}
void DidChangeTopControlsPosition() override {
redraw_needed_ = true;
@@ -72,15 +73,12 @@ class MockTopControlsManagerClient : public TopControlsManagerClient {
return top_controls_shown_ratio_;
}
- LayerImpl* rootScrollLayer() {
- return root_scroll_layer_.get();
- }
+ LayerImpl* rootScrollLayer() { return root_scroll_layer_.get(); }
- TopControlsManager* manager() {
+ BrowserControlsOffsetManager* manager() {
if (!manager_) {
- manager_ = TopControlsManager::Create(this,
- top_controls_show_threshold_,
- top_controls_hide_threshold_);
+ manager_ = BrowserControlsOffsetManager::Create(
+ this, top_controls_show_threshold_, top_controls_hide_threshold_);
}
return manager_.get();
}
@@ -98,7 +96,7 @@ class MockTopControlsManagerClient : public TopControlsManagerClient {
FakeLayerTreeHostImpl host_impl_;
std::unique_ptr<LayerTreeImpl> active_tree_;
std::unique_ptr<LayerImpl> root_scroll_layer_;
- std::unique_ptr<TopControlsManager> manager_;
+ std::unique_ptr<BrowserControlsOffsetManager> manager_;
bool redraw_needed_;
bool update_draw_properties_needed_;
@@ -109,9 +107,9 @@ class MockTopControlsManagerClient : public TopControlsManagerClient {
float top_controls_hide_threshold_;
};
-TEST(TopControlsManagerTest, EnsureScrollThresholdApplied) {
- MockTopControlsManagerClient client(100.f, 0.5f, 0.5f);
- TopControlsManager* manager = client.manager();
+TEST(BrowserControlsOffsetManagerTest, EnsureScrollThresholdApplied) {
+ MockBrowserControlsOffsetManagerClient client(100.f, 0.5f, 0.5f);
+ BrowserControlsOffsetManager* manager = client.manager();
manager->ScrollBegin();
@@ -153,9 +151,9 @@ TEST(TopControlsManagerTest, EnsureScrollThresholdApplied) {
manager->ScrollEnd();
}
-TEST(TopControlsManagerTest, PartialShownHideAnimation) {
- MockTopControlsManagerClient client(100.f, 0.5f, 0.5f);
- TopControlsManager* manager = client.manager();
+TEST(BrowserControlsOffsetManagerTest, PartialShownHideAnimation) {
+ MockBrowserControlsOffsetManagerClient client(100.f, 0.5f, 0.5f);
+ BrowserControlsOffsetManager* manager = client.manager();
manager->ScrollBegin();
manager->ScrollBy(gfx::Vector2dF(0.f, 300.f));
EXPECT_FLOAT_EQ(-100.f, manager->ControlsTopOffset());
@@ -183,9 +181,9 @@ TEST(TopControlsManagerTest, PartialShownHideAnimation) {
EXPECT_FLOAT_EQ(0.f, manager->ContentTopOffset());
}
-TEST(TopControlsManagerTest, PartialShownShowAnimation) {
- MockTopControlsManagerClient client(100.f, 0.5f, 0.5f);
- TopControlsManager* manager = client.manager();
+TEST(BrowserControlsOffsetManagerTest, PartialShownShowAnimation) {
+ MockBrowserControlsOffsetManagerClient client(100.f, 0.5f, 0.5f);
+ BrowserControlsOffsetManager* manager = client.manager();
manager->ScrollBegin();
manager->ScrollBy(gfx::Vector2dF(0.f, 300.f));
EXPECT_FLOAT_EQ(-100.f, manager->ControlsTopOffset());
@@ -213,9 +211,10 @@ TEST(TopControlsManagerTest, PartialShownShowAnimation) {
EXPECT_FLOAT_EQ(100.f, manager->ContentTopOffset());
}
-TEST(TopControlsManagerTest, PartialHiddenWithAmbiguousThresholdShows) {
- MockTopControlsManagerClient client(100.f, 0.25f, 0.25f);
- TopControlsManager* manager = client.manager();
+TEST(BrowserControlsOffsetManagerTest,
+ PartialHiddenWithAmbiguousThresholdShows) {
+ MockBrowserControlsOffsetManagerClient client(100.f, 0.25f, 0.25f);
+ BrowserControlsOffsetManager* manager = client.manager();
manager->ScrollBegin();
@@ -239,9 +238,10 @@ TEST(TopControlsManagerTest, PartialHiddenWithAmbiguousThresholdShows) {
EXPECT_FLOAT_EQ(100.f, manager->ContentTopOffset());
}
-TEST(TopControlsManagerTest, PartialHiddenWithAmbiguousThresholdHides) {
- MockTopControlsManagerClient client(100.f, 0.25f, 0.25f);
- TopControlsManager* manager = client.manager();
+TEST(BrowserControlsOffsetManagerTest,
+ PartialHiddenWithAmbiguousThresholdHides) {
+ MockBrowserControlsOffsetManagerClient client(100.f, 0.25f, 0.25f);
+ BrowserControlsOffsetManager* manager = client.manager();
manager->ScrollBegin();
@@ -265,9 +265,10 @@ TEST(TopControlsManagerTest, PartialHiddenWithAmbiguousThresholdHides) {
EXPECT_FLOAT_EQ(0.f, manager->ContentTopOffset());
}
-TEST(TopControlsManagerTest, PartialShownWithAmbiguousThresholdHides) {
- MockTopControlsManagerClient client(100.f, 0.25f, 0.25f);
- TopControlsManager* manager = client.manager();
+TEST(BrowserControlsOffsetManagerTest,
+ PartialShownWithAmbiguousThresholdHides) {
+ MockBrowserControlsOffsetManagerClient client(100.f, 0.25f, 0.25f);
+ BrowserControlsOffsetManager* manager = client.manager();
manager->ScrollBy(gfx::Vector2dF(0.f, 200.f));
EXPECT_FLOAT_EQ(-100.f, manager->ControlsTopOffset());
@@ -295,9 +296,10 @@ TEST(TopControlsManagerTest, PartialShownWithAmbiguousThresholdHides) {
EXPECT_FLOAT_EQ(0.f, manager->ContentTopOffset());
}
-TEST(TopControlsManagerTest, PartialShownWithAmbiguousThresholdShows) {
- MockTopControlsManagerClient client(100.f, 0.25f, 0.25f);
- TopControlsManager* manager = client.manager();
+TEST(BrowserControlsOffsetManagerTest,
+ PartialShownWithAmbiguousThresholdShows) {
+ MockBrowserControlsOffsetManagerClient client(100.f, 0.25f, 0.25f);
+ BrowserControlsOffsetManager* manager = client.manager();
manager->ScrollBy(gfx::Vector2dF(0.f, 200.f));
EXPECT_FLOAT_EQ(-100.f, manager->ControlsTopOffset());
@@ -325,9 +327,9 @@ TEST(TopControlsManagerTest, PartialShownWithAmbiguousThresholdShows) {
EXPECT_FLOAT_EQ(100.f, manager->ContentTopOffset());
}
-TEST(TopControlsManagerTest, PinchIgnoresScroll) {
- MockTopControlsManagerClient client(100.f, 0.5f, 0.5f);
- TopControlsManager* manager = client.manager();
+TEST(BrowserControlsOffsetManagerTest, PinchIgnoresScroll) {
+ MockBrowserControlsOffsetManagerClient client(100.f, 0.5f, 0.5f);
+ BrowserControlsOffsetManager* manager = client.manager();
// Hide the controls.
manager->ScrollBegin();
@@ -354,9 +356,9 @@ TEST(TopControlsManagerTest, PinchIgnoresScroll) {
EXPECT_TRUE(manager->has_animation());
}
-TEST(TopControlsManagerTest, PinchBeginStartsAnimationIfNecessary) {
- MockTopControlsManagerClient client(100.f, 0.5f, 0.5f);
- TopControlsManager* manager = client.manager();
+TEST(BrowserControlsOffsetManagerTest, PinchBeginStartsAnimationIfNecessary) {
+ MockBrowserControlsOffsetManagerClient client(100.f, 0.5f, 0.5f);
+ BrowserControlsOffsetManager* manager = client.manager();
manager->ScrollBegin();
manager->ScrollBy(gfx::Vector2dF(0.f, 300.f));
@@ -407,9 +409,10 @@ TEST(TopControlsManagerTest, PinchBeginStartsAnimationIfNecessary) {
EXPECT_FLOAT_EQ(0.f, manager->ControlsTopOffset());
}
-TEST(TopControlsManagerTest, HeightChangeMaintainsFullyVisibleControls) {
- MockTopControlsManagerClient client(0.f, 0.5f, 0.5f);
- TopControlsManager* manager = client.manager();
+TEST(BrowserControlsOffsetManagerTest,
+ HeightChangeMaintainsFullyVisibleControls) {
+ MockBrowserControlsOffsetManagerClient client(0.f, 0.5f, 0.5f);
+ BrowserControlsOffsetManager* manager = client.manager();
EXPECT_FLOAT_EQ(0.f, manager->ControlsTopOffset());
@@ -424,9 +427,9 @@ TEST(TopControlsManagerTest, HeightChangeMaintainsFullyVisibleControls) {
EXPECT_FLOAT_EQ(0.f, manager->ControlsTopOffset());
}
-TEST(TopControlsManagerTest, GrowingHeightKeepsTopControlsHidden) {
- MockTopControlsManagerClient client(0.f, 0.5f, 0.5f);
- TopControlsManager* manager = client.manager();
+TEST(BrowserControlsOffsetManagerTest, GrowingHeightKeepsTopControlsHidden) {
+ MockBrowserControlsOffsetManagerClient client(0.f, 0.5f, 0.5f);
+ BrowserControlsOffsetManager* manager = client.manager();
client.SetTopControlsHeight(1.f);
manager->UpdateTopControlsState(HIDDEN, HIDDEN, false);
EXPECT_EQ(-1.f, manager->ControlsTopOffset());
@@ -443,9 +446,9 @@ TEST(TopControlsManagerTest, GrowingHeightKeepsTopControlsHidden) {
EXPECT_EQ(0.f, manager->ContentTopOffset());
}
-TEST(TopControlsManagerTest, ShrinkingHeightKeepsTopControlsHidden) {
- MockTopControlsManagerClient client(100.f, 0.5f, 0.5f);
- TopControlsManager* manager = client.manager();
+TEST(BrowserControlsOffsetManagerTest, ShrinkingHeightKeepsTopControlsHidden) {
+ MockBrowserControlsOffsetManagerClient client(100.f, 0.5f, 0.5f);
+ BrowserControlsOffsetManager* manager = client.manager();
manager->ScrollBegin();
manager->ScrollBy(gfx::Vector2dF(0.f, 300.f));
@@ -464,9 +467,9 @@ TEST(TopControlsManagerTest, ShrinkingHeightKeepsTopControlsHidden) {
EXPECT_FLOAT_EQ(0.f, manager->ContentTopOffset());
}
-TEST(TopControlsManagerTest, ScrollByWithZeroHeightControlsIsNoop) {
- MockTopControlsManagerClient client(0.f, 0.5f, 0.5f);
- TopControlsManager* manager = client.manager();
+TEST(BrowserControlsOffsetManagerTest, ScrollByWithZeroHeightControlsIsNoop) {
+ MockBrowserControlsOffsetManagerClient client(0.f, 0.5f, 0.5f);
+ BrowserControlsOffsetManager* manager = client.manager();
manager->UpdateTopControlsState(BOTH, BOTH, false);
manager->ScrollBegin();
@@ -478,10 +481,10 @@ TEST(TopControlsManagerTest, ScrollByWithZeroHeightControlsIsNoop) {
manager->ScrollEnd();
}
-TEST(TopControlsManagerTest, ScrollThenRestoreBottomControls) {
- MockTopControlsManagerClient client(100.f, 0.5f, 0.5f);
+TEST(BrowserControlsOffsetManagerTest, ScrollThenRestoreBottomControls) {
+ MockBrowserControlsOffsetManagerClient client(100.f, 0.5f, 0.5f);
client.SetBottomControlsHeight(100.f);
- TopControlsManager* manager = client.manager();
+ BrowserControlsOffsetManager* manager = client.manager();
manager->ScrollBegin();
manager->ScrollBy(gfx::Vector2dF(0.f, 20.f));
EXPECT_FLOAT_EQ(80.f, manager->ContentBottomOffset());
@@ -495,10 +498,11 @@ TEST(TopControlsManagerTest, ScrollThenRestoreBottomControls) {
manager->ScrollEnd();
}
-TEST(TopControlsManagerTest, ScrollThenRestoreBottomControlsNoTopControls) {
- MockTopControlsManagerClient client(0.f, 0.5f, 0.5f);
+TEST(BrowserControlsOffsetManagerTest,
+ ScrollThenRestoreBottomControlsNoTopControls) {
+ MockBrowserControlsOffsetManagerClient client(0.f, 0.5f, 0.5f);
client.SetBottomControlsHeight(100.f);
- TopControlsManager* manager = client.manager();
+ BrowserControlsOffsetManager* manager = client.manager();
manager->ScrollBegin();
manager->ScrollBy(gfx::Vector2dF(0.f, 20.f));
EXPECT_FLOAT_EQ(80.f, manager->ContentBottomOffset());
@@ -512,10 +516,10 @@ TEST(TopControlsManagerTest, ScrollThenRestoreBottomControlsNoTopControls) {
manager->ScrollEnd();
}
-TEST(TopControlsManagerTest, HideAndPeekBottomControls) {
- MockTopControlsManagerClient client(100.f, 0.5f, 0.5f);
+TEST(BrowserControlsOffsetManagerTest, HideAndPeekBottomControls) {
+ MockBrowserControlsOffsetManagerClient client(100.f, 0.5f, 0.5f);
client.SetBottomControlsHeight(100.f);
- TopControlsManager* manager = client.manager();
+ BrowserControlsOffsetManager* manager = client.manager();
manager->ScrollBegin();
manager->ScrollBy(gfx::Vector2dF(0.f, 300.f));
EXPECT_FLOAT_EQ(0.f, manager->ContentBottomOffset());
@@ -529,10 +533,11 @@ TEST(TopControlsManagerTest, HideAndPeekBottomControls) {
manager->ScrollEnd();
}
-TEST(TopControlsManagerTest, HideAndImmediateShowKeepsControlsVisible) {
- MockTopControlsManagerClient client(100.f, 0.5f, 0.5f);
+TEST(BrowserControlsOffsetManagerTest,
+ HideAndImmediateShowKeepsControlsVisible) {
+ MockBrowserControlsOffsetManagerClient client(100.f, 0.5f, 0.5f);
client.SetBottomControlsHeight(100.f);
- TopControlsManager* manager = client.manager();
+ BrowserControlsOffsetManager* manager = client.manager();
EXPECT_FLOAT_EQ(1.f, client.CurrentTopControlsShownRatio());
manager->UpdateTopControlsState(BOTH, HIDDEN, true);
« cc/input/browser_controls_offset_manager_client.h ('K') | « cc/input/browser_controls_offset_manager_client.h ('k') | cc/input/browser_controls_state.h » ('j') | cc/test/fake_proxy.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698