| 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 6965594181cb0a4dd868f89b7894ae6e36d2fdfa..c3f899242bcd7dc201816fe02bec1563138d26ed 100644
|
| --- a/cc/trees/layer_tree_host_impl.cc
|
| +++ b/cc/trees/layer_tree_host_impl.cc
|
| @@ -3387,21 +3387,6 @@ InputHandler::ScrollStatus LayerTreeHostImpl::FlingScrollBegin() {
|
| return scroll_status;
|
| }
|
|
|
| -float LayerTreeHostImpl::DeviceSpaceDistanceToLayer(
|
| - const gfx::PointF& device_viewport_point,
|
| - LayerImpl* layer_impl) {
|
| - if (!layer_impl)
|
| - return std::numeric_limits<float>::max();
|
| -
|
| - gfx::Rect layer_impl_bounds(layer_impl->bounds());
|
| -
|
| - gfx::RectF device_viewport_layer_impl_bounds = MathUtil::MapClippedRect(
|
| - layer_impl->ScreenSpaceTransform(), gfx::RectF(layer_impl_bounds));
|
| -
|
| - return device_viewport_layer_impl_bounds.ManhattanDistanceToPoint(
|
| - device_viewport_point);
|
| -}
|
| -
|
| void LayerTreeHostImpl::MouseDown() {
|
| ScrollbarAnimationController* animation_controller =
|
| ScrollbarAnimationControllerForElementId(
|
| @@ -3470,10 +3455,8 @@ void LayerTreeHostImpl::MouseMoveAt(const gfx::Point& viewport_point) {
|
| return;
|
|
|
| for (auto* scrollbar : active_tree_->ScrollbarsFor(scroll_element_id)) {
|
| - new_animation_controller->DidMouseMoveNear(
|
| - scrollbar->orientation(),
|
| - DeviceSpaceDistanceToLayer(device_viewport_point, scrollbar) /
|
| - active_tree_->device_scale_factor());
|
| + new_animation_controller->DidMouseMoveNear(scrollbar->orientation(),
|
| + device_viewport_point);
|
| }
|
| }
|
|
|
|
|