| 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 994de54524c2b588e41fcacd58268efb6a2ae424..60bb2ee17551b0c040c2b06254d08f987e86cc33 100644
|
| --- a/cc/trees/layer_tree_host_impl_unittest.cc
|
| +++ b/cc/trees/layer_tree_host_impl_unittest.cc
|
| @@ -542,6 +542,37 @@ TEST_F(LayerTreeHostImplTest, scrollByReturnsCorrectValue)
|
| EXPECT_TRUE(m_hostImpl->ScrollBy(gfx::Point(), gfx::Vector2d(5000, 5000)));
|
| }
|
|
|
| +TEST_F(LayerTreeHostImplTest, scrollVerticallyByPageReturnsCorrectValue)
|
| +{
|
| + setupScrollAndContentsLayers(gfx::Size(200, 200));
|
| + m_hostImpl->SetViewportSize(gfx::Size(100, 100), gfx::Size(100, 100));
|
| +
|
| + initializeRendererAndDrawFrame();
|
| +
|
| + EXPECT_EQ(InputHandlerClient::ScrollStarted,
|
| + m_hostImpl->ScrollBegin(gfx::Point(0, 0), InputHandlerClient::Wheel));
|
| +
|
| + // Trying to scroll without a vertical scrollbar will fail.
|
| + EXPECT_FALSE(m_hostImpl->ScrollVerticallyByPage(
|
| + gfx::Point(), WebKit::WebScrollbar::ScrollForward));
|
| + EXPECT_FALSE(m_hostImpl->ScrollVerticallyByPage(
|
| + gfx::Point(), WebKit::WebScrollbar::ScrollBackward));
|
| +
|
| + scoped_ptr<cc::ScrollbarLayerImpl> vertical_scrollbar(
|
| + cc::ScrollbarLayerImpl::Create(
|
| + m_hostImpl->active_tree(),
|
| + 20,
|
| + scoped_ptr<ScrollbarGeometryFixedThumb>()));
|
| + m_hostImpl->RootScrollLayer()->SetVerticalScrollbarLayer(
|
| + vertical_scrollbar.get());
|
| +
|
| + // Trying to scroll with a vertical scrollbar will succeed.
|
| + EXPECT_TRUE(m_hostImpl->ScrollVerticallyByPage(
|
| + gfx::Point(), WebKit::WebScrollbar::ScrollForward));
|
| + EXPECT_TRUE(m_hostImpl->ScrollVerticallyByPage(
|
| + gfx::Point(), WebKit::WebScrollbar::ScrollBackward));
|
| +}
|
| +
|
| TEST_F(LayerTreeHostImplTest, clearRootRenderSurfaceAndHitTestTouchHandlerRegion)
|
| {
|
| setupScrollAndContentsLayers(gfx::Size(100, 100));
|
|
|