diff options
author | skobes <skobes@chromium.org> | 2015-08-04 13:38:05 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-08-04 20:39:48 +0000 |
commit | 93102bcfca81af17e97fcad1c28b027fa7cad114 (patch) | |
tree | d1b1392ef7ec0828370b0dea648734b2761156fc /cc/trees/layer_tree_impl_unittest.cc | |
parent | 07ea627e1310ea81313db708d044753e7507b100 (diff) | |
download | chromium_src-93102bcfca81af17e97fcad1c28b027fa7cad114.zip chromium_src-93102bcfca81af17e97fcad1c28b027fa7cad114.tar.gz chromium_src-93102bcfca81af17e97fcad1c28b027fa7cad114.tar.bz2 |
Don't hide pinch viewport scrollbars near min-scale with device emulation.
Depends on http://crrev.com/1269813004.
BUG=515746
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel
Review URL: https://codereview.chromium.org/1267603004
Cr-Commit-Position: refs/heads/master@{#341784}
Diffstat (limited to 'cc/trees/layer_tree_impl_unittest.cc')
-rw-r--r-- | cc/trees/layer_tree_impl_unittest.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cc/trees/layer_tree_impl_unittest.cc b/cc/trees/layer_tree_impl_unittest.cc index 9e8fee5..5681418 100644 --- a/cc/trees/layer_tree_impl_unittest.cc +++ b/cc/trees/layer_tree_impl_unittest.cc @@ -25,7 +25,6 @@ class LayerTreeImplTest : public LayerTreeHostCommonTest { LayerTreeImplTest() { LayerTreeSettings settings; settings.layer_transforms_should_scale_layer_contents = true; - settings.scrollbar_show_scale_threshold = 1.1f; host_impl_.reset(new FakeLayerTreeHostImpl( settings, &proxy_, &shared_bitmap_manager_, &task_graph_runner_)); EXPECT_TRUE(host_impl_->InitializeRenderer(FakeOutputSurface::Create3d())); @@ -1296,6 +1295,7 @@ TEST_F(LayerTreeImplTest, MakeScrollbarsInvisibleNearMinPageScale) { const bool kIsOverlayScrollbar = true; LayerTreeImpl* active_tree = host_impl().active_tree(); + active_tree->set_hide_pinch_scrollbars_near_min_scale(true); scoped_ptr<LayerImpl> scroll_layer = LayerImpl::Create(active_tree, 1); scoped_ptr<SolidColorScrollbarLayerImpl> vertical_scrollbar_layer = @@ -1343,11 +1343,11 @@ TEST_F(LayerTreeImplTest, MakeScrollbarsInvisibleNearMinPageScale) { EXPECT_TRUE(vertical_scrollbar_layer->hide_layer_and_subtree()); EXPECT_TRUE(horizontal_scrollbar_layer->hide_layer_and_subtree()); - active_tree->PushPageScaleFromMainThread(1.05f, 1.0f, 4.0f); + active_tree->PushPageScaleFromMainThread(1.04f, 1.0f, 4.0f); EXPECT_TRUE(vertical_scrollbar_layer->hide_layer_and_subtree()); EXPECT_TRUE(horizontal_scrollbar_layer->hide_layer_and_subtree()); - active_tree->PushPageScaleFromMainThread(1.1f, 1.0f, 4.0f); + active_tree->PushPageScaleFromMainThread(1.06f, 1.0f, 4.0f); EXPECT_FALSE(vertical_scrollbar_layer->hide_layer_and_subtree()); EXPECT_FALSE(horizontal_scrollbar_layer->hide_layer_and_subtree()); |