| Index: cc/trees/layer_tree_host_impl.cc
|
| diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc
|
| index bf37c5139d20b2e866efe99ebd520aa06dd0661d..cff29c5ed26cc891bd9e253e19da26f306482c7f 100644
|
| --- a/cc/trees/layer_tree_host_impl.cc
|
| +++ b/cc/trees/layer_tree_host_impl.cc
|
| @@ -491,8 +491,8 @@ bool LayerTreeHostImpl::IsCurrentlyScrollingLayerAt(
|
| gfx::PointF device_viewport_point =
|
| gfx::ScalePoint(viewport_point, device_scale_factor_);
|
|
|
| - LayerImpl* layer_impl = LayerTreeHostCommon::FindLayerThatIsHitByPoint(
|
| - device_viewport_point, active_tree_->RenderSurfaceLayerList());
|
| + LayerImpl* layer_impl =
|
| + active_tree_->FindLayerThatIsHitByPoint(device_viewport_point);
|
|
|
| bool scroll_on_main_thread = false;
|
| LayerImpl* scrolling_layer_impl = FindScrollLayerForDeviceViewportPoint(
|
| @@ -511,9 +511,9 @@ bool LayerTreeHostImpl::HaveTouchEventHandlersAt(
|
| gfx::ScalePoint(viewport_point, device_scale_factor_);
|
|
|
| LayerImpl* layer_impl =
|
| - LayerTreeHostCommon::FindLayerThatIsHitByPointInTouchHandlerRegion(
|
| - device_viewport_point,
|
| - active_tree_->RenderSurfaceLayerList());
|
| + active_tree_->FindLayerThatIsHitByPointInTouchHandlerRegion(
|
| + device_viewport_point);
|
| +
|
| return layer_impl != NULL;
|
| }
|
|
|
| @@ -2220,14 +2220,13 @@ InputHandler::ScrollStatus LayerTreeHostImpl::ScrollBegin(
|
|
|
| gfx::PointF device_viewport_point = gfx::ScalePoint(viewport_point,
|
| device_scale_factor_);
|
| - LayerImpl* layer_impl = LayerTreeHostCommon::FindLayerThatIsHitByPoint(
|
| - device_viewport_point,
|
| - active_tree_->RenderSurfaceLayerList());
|
| + LayerImpl* layer_impl =
|
| + active_tree_->FindLayerThatIsHitByPoint(device_viewport_point);
|
|
|
| if (layer_impl) {
|
| LayerImpl* scroll_layer_impl =
|
| - LayerTreeHostCommon::FindFirstScrollingLayerThatIsHitByPoint(
|
| - device_viewport_point, active_tree_->RenderSurfaceLayerList());
|
| + active_tree_->FindFirstScrollingLayerThatIsHitByPoint(
|
| + device_viewport_point);
|
| if (scroll_layer_impl && !HasScrollAncestor(layer_impl, scroll_layer_impl))
|
| return ScrollUnknown;
|
| }
|
| @@ -2587,10 +2586,8 @@ void LayerTreeHostImpl::MouseMoveAt(const gfx::Point& viewport_point) {
|
|
|
| gfx::PointF device_viewport_point = gfx::ScalePoint(viewport_point,
|
| device_scale_factor_);
|
| -
|
| - LayerImpl* layer_impl = LayerTreeHostCommon::FindLayerThatIsHitByPoint(
|
| - device_viewport_point,
|
| - active_tree_->RenderSurfaceLayerList());
|
| + LayerImpl* layer_impl =
|
| + active_tree_->FindLayerThatIsHitByPoint(device_viewport_point);
|
| if (HandleMouseOverScrollbar(layer_impl, device_viewport_point))
|
| return;
|
|
|
|
|