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

Unified Diff: cc/trees/layer_tree_host_impl_unittest.cc

Issue 769273002: Hide/show topbar when scrolling page up or down. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed test case Created 6 years 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
« no previous file with comments | « cc/trees/layer_tree_host_impl.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/trees/layer_tree_host_impl_unittest.cc
diff --git a/cc/trees/layer_tree_host_impl_unittest.cc b/cc/trees/layer_tree_host_impl_unittest.cc
index f31cde05c41bb4ae630d187e8787673ca34b9db8..c3b5f0f76361dc1f015aa1bfa597b04314fc65fa 100644
--- a/cc/trees/layer_tree_host_impl_unittest.cc
+++ b/cc/trees/layer_tree_host_impl_unittest.cc
@@ -2545,6 +2545,54 @@ TEST_F(LayerTreeHostImplTopControlsTest, FixedContainerDelta) {
host_impl_->top_controls_manager()->ScrollEnd();
}
+// Test that if a scrollable sublayer doesn't consume the scroll,
+// top controls should hide when scrolling down.
+TEST_F(LayerTreeHostImplTopControlsTest, TopControlsScrollableSublayer) {
+ gfx::Size sub_content_size(100, 400);
+ gfx::Size sub_content_layer_size(100, 300);
+ SetupTopControlsAndScrollLayerWithVirtualViewport(
+ gfx::Size(100, 50), gfx::Size(100, 100), gfx::Size(100, 100));
+ DrawFrame();
+
+ // Show top controls
+ EXPECT_EQ(top_controls_height_,
+ host_impl_->active_tree()->total_top_controls_content_offset());
+
+ LayerImpl* outer_viewport_scroll_layer =
+ host_impl_->active_tree()->OuterViewportScrollLayer();
+ int id = outer_viewport_scroll_layer->id();
+
+ scoped_ptr<LayerImpl> child =
+ LayerImpl::Create(host_impl_->active_tree(), id + 2);
+ scoped_ptr<LayerImpl> child_clip =
+ LayerImpl::Create(host_impl_->active_tree(), id + 3);
+
+ child_clip->SetBounds(sub_content_layer_size);
+ child->SetScrollClipLayer(child_clip->id());
+ child->SetBounds(sub_content_size);
+ child->SetContentBounds(sub_content_size);
+ child->SetPosition(gfx::PointF());
+ child->SetDrawsContent(true);
+ child->SetIsContainerForFixedPositionLayers(true);
+
+ // scroll child to limit
+ child->SetScrollDelta(gfx::Vector2dF(0, 100.f));
+ child_clip->AddChild(child.Pass());
+ outer_viewport_scroll_layer->AddChild(child_clip.Pass());
+
+ // Scroll 25px to hide top controls
+ gfx::Vector2dF scroll_delta(0.f, 25.f);
+ EXPECT_EQ(InputHandler::ScrollStarted,
+ host_impl_->ScrollBegin(gfx::Point(), InputHandler::Gesture));
+ host_impl_->ScrollBy(gfx::Point(), scroll_delta);
+ host_impl_->ScrollEnd();
+
+ // Top controls should be hidden
+ EXPECT_EQ(scroll_delta.y(),
+ top_controls_height_ -
+ host_impl_->active_tree()->total_top_controls_content_offset());
+}
+
// Ensure setting the top controls position explicitly using the setters on the
// TreeImpl correctly affects the top controls manager and viewport bounds.
TEST_F(LayerTreeHostImplTopControlsTest, PositionTopControlsExplicitly) {
« no previous file with comments | « cc/trees/layer_tree_host_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698