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

Unified Diff: cc/trees/layer_tree_host_impl.cc

Issue 266913021: Hit test on the layer tree rather than the RSLL (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Helps if you upload all your files. Created 6 years, 7 months 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_common_unittest.cc ('k') | cc/trees/layer_tree_host_impl_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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;
« no previous file with comments | « cc/trees/layer_tree_host_common_unittest.cc ('k') | cc/trees/layer_tree_host_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698