Commit 58714dad authored by Sahir Vellani's avatar Sahir Vellani Committed by Commit Bot

Refactored ScrollbarController function names

There is nothing specific to the mouse in the implementation of
HandleMouseUp/Down functions, so giving it a more generic 'Pointer' name

Bug: 959430
Change-Id: I477ab7cdd65cc374384cae8361cacdde91fb4de0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1783668Reviewed-by: default avatarDaniel Libby <dlibby@microsoft.com>
Reviewed-by: default avatarDavid Bokan <bokan@chromium.org>
Commit-Queue: Sahir Vellani <sahir.vellani@microsoft.com>
Cr-Commit-Position: refs/heads/master@{#693795}
parent 08e97ccf
...@@ -77,7 +77,7 @@ gfx::Vector2dF ScrollbarController::GetThumbRelativePoint( ...@@ -77,7 +77,7 @@ gfx::Vector2dF ScrollbarController::GetThumbRelativePoint(
// Performs hit test and prepares scroll deltas that will be used by GSB and // Performs hit test and prepares scroll deltas that will be used by GSB and
// GSU. // GSU.
InputHandlerPointerResult ScrollbarController::HandleMouseDown( InputHandlerPointerResult ScrollbarController::HandlePointerDown(
const gfx::PointF position_in_widget) { const gfx::PointF position_in_widget) {
InputHandlerPointerResult scroll_result; InputHandlerPointerResult scroll_result;
LayerImpl* layer_impl = GetLayerHitByPoint(position_in_widget); LayerImpl* layer_impl = GetLayerHitByPoint(position_in_widget);
...@@ -381,7 +381,7 @@ void ScrollbarController::StartAutoScrollAnimation(const float velocity, ...@@ -381,7 +381,7 @@ void ScrollbarController::StartAutoScrollAnimation(const float velocity,
} }
// Performs hit test and prepares scroll deltas that will be used by GSE. // Performs hit test and prepares scroll deltas that will be used by GSE.
InputHandlerPointerResult ScrollbarController::HandleMouseUp( InputHandlerPointerResult ScrollbarController::HandlePointerUp(
const gfx::PointF position_in_widget) { const gfx::PointF position_in_widget) {
InputHandlerPointerResult scroll_result; InputHandlerPointerResult scroll_result;
if (scrollbar_scroll_is_active_) { if (scrollbar_scroll_is_active_) {
......
...@@ -19,11 +19,12 @@ class CC_EXPORT ScrollbarController { ...@@ -19,11 +19,12 @@ class CC_EXPORT ScrollbarController {
explicit ScrollbarController(LayerTreeHostImpl*); explicit ScrollbarController(LayerTreeHostImpl*);
virtual ~ScrollbarController(); virtual ~ScrollbarController();
InputHandlerPointerResult HandleMouseDown( InputHandlerPointerResult HandlePointerDown(
const gfx::PointF position_in_widget); const gfx::PointF position_in_widget);
InputHandlerPointerResult HandleMouseMove( InputHandlerPointerResult HandleMouseMove(
const gfx::PointF position_in_widget); const gfx::PointF position_in_widget);
InputHandlerPointerResult HandleMouseUp(const gfx::PointF position_in_widget); InputHandlerPointerResult HandlePointerUp(
const gfx::PointF position_in_widget);
// "velocity" here is calculated based on the initial scroll delta (See // "velocity" here is calculated based on the initial scroll delta (See
// InitialDeltaToAutoscrollVelocity). This value carries a "sign" which is // InitialDeltaToAutoscrollVelocity). This value carries a "sign" which is
......
...@@ -4964,7 +4964,7 @@ InputHandlerPointerResult LayerTreeHostImpl::MouseDown( ...@@ -4964,7 +4964,7 @@ InputHandlerPointerResult LayerTreeHostImpl::MouseDown(
InputHandlerPointerResult result; InputHandlerPointerResult result;
if (settings().compositor_threaded_scrollbar_scrolling) if (settings().compositor_threaded_scrollbar_scrolling)
result = scrollbar_controller_->HandleMouseDown(viewport_point); result = scrollbar_controller_->HandlePointerDown(viewport_point);
return result; return result;
} }
...@@ -4984,7 +4984,7 @@ InputHandlerPointerResult LayerTreeHostImpl::MouseUp( ...@@ -4984,7 +4984,7 @@ InputHandlerPointerResult LayerTreeHostImpl::MouseUp(
InputHandlerPointerResult result; InputHandlerPointerResult result;
if (settings().compositor_threaded_scrollbar_scrolling) if (settings().compositor_threaded_scrollbar_scrolling)
result = scrollbar_controller_->HandleMouseUp(viewport_point); result = scrollbar_controller_->HandlePointerUp(viewport_point);
return result; return result;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment