summaryrefslogtreecommitdiffstats
path: root/cc/trees/layer_tree_host_impl_unittest.cc
diff options
context:
space:
mode:
authordtapuska <dtapuska@chromium.org>2016-01-29 07:14:48 -0800
committerCommit bot <commit-bot@chromium.org>2016-01-29 15:15:37 +0000
commitee0b6981de62e9a234d031eab793da8d7752197b (patch)
treeef42a954bec374daaf7ca14a16a52e361c22ae56 /cc/trees/layer_tree_host_impl_unittest.cc
parentc068fa909f540cc362576559c7eb9e205918f0a1 (diff)
downloadchromium_src-ee0b6981de62e9a234d031eab793da8d7752197b.zip
chromium_src-ee0b6981de62e9a234d031eab793da8d7752197b.tar.gz
chromium_src-ee0b6981de62e9a234d031eab793da8d7752197b.tar.bz2
Move have_wheel_event_handlers to WebLayerTreeView.
Since having wheel event handlers was based on the document in general there was no need for the hit testing code for determining the layer in cc. So it makes more sense to have these fields on the layer tree view. BUG=489802 CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel Review URL: https://codereview.chromium.org/1639363002 Cr-Commit-Position: refs/heads/master@{#372346}
Diffstat (limited to 'cc/trees/layer_tree_host_impl_unittest.cc')
-rw-r--r--cc/trees/layer_tree_host_impl_unittest.cc5
1 files changed, 2 insertions, 3 deletions
diff --git a/cc/trees/layer_tree_host_impl_unittest.cc b/cc/trees/layer_tree_host_impl_unittest.cc
index 49c7103..a66eb514 100644
--- a/cc/trees/layer_tree_host_impl_unittest.cc
+++ b/cc/trees/layer_tree_host_impl_unittest.cc
@@ -714,11 +714,10 @@ TEST_F(LayerTreeHostImplTest, ScrollBlocksOnWheelEventHandlers) {
SetupScrollAndContentsLayers(gfx::Size(100, 100));
host_impl_->SetViewportSize(gfx::Size(50, 50));
DrawFrame();
- LayerImpl* root = host_impl_->active_tree()->root_layer();
// With registered event handlers, wheel scrolls don't necessarily
// have to go to the main thread.
- root->SetHaveWheelEventHandlers(true);
+ host_impl_->active_tree()->set_have_wheel_event_handlers(true);
InputHandler::ScrollStatus status =
host_impl_->ScrollBegin(BeginState(gfx::Point()).get(),
InputHandler::WHEEL);
@@ -736,7 +735,7 @@ TEST_F(LayerTreeHostImplTest, ScrollBlocksOnWheelEventHandlers) {
// And if the handlers go away, wheel scrolls can again be processed
// on impl (despite the scroll-blocks-on mode).
- root->SetHaveWheelEventHandlers(false);
+ host_impl_->active_tree()->set_have_wheel_event_handlers(false);
status = host_impl_->ScrollBegin(BeginState(gfx::Point()).get(),
InputHandler::WHEEL);
EXPECT_EQ(InputHandler::SCROLL_ON_IMPL_THREAD, status.thread);