Replace blink wrapper with cc::SnapFlingController
Replace uses of SnapFlingController from
third_party/blink/renderer/platform/scroll_snap_data.h with the
unwrapped type from cc/input/scroll_snap_data.h.
This is part of a series of CLs to remove platform/scroll.
Bug: 922111
Change-Id: I857a0384e1893ffb677701365a793f0bc1528610
Reviewed-on: https://chromium-review.googlesource.com/c/1482456
Commit-Queue: Henrique Ferreiro <hferreiro@igalia.com>
Reviewed-by: Kentaro Hara <haraken@chromium.org>
Cr-Commit-Position: refs/heads/master@{#635002}diff --git a/third_party/blink/renderer/core/DEPS b/third_party/blink/renderer/core/DEPS
index c267a7a..1118be9 100644
--- a/third_party/blink/renderer/core/DEPS
+++ b/third_party/blink/renderer/core/DEPS
@@ -22,6 +22,7 @@
"+cc/input/scrollbar.h",
"+cc/input/scroll_snap_data.h",
"+cc/input/scroll_state.h",
+ "+cc/input/snap_fling_controller.h",
"+cc/layers/content_layer_client.h",
"+cc/layers/layer.h",
"+cc/layers/layer_position_constraint.h",
diff --git a/third_party/blink/renderer/core/input/scroll_manager.cc b/third_party/blink/renderer/core/input/scroll_manager.cc
index df0039b..6d15632 100644
--- a/third_party/blink/renderer/core/input/scroll_manager.cc
+++ b/third_party/blink/renderer/core/input/scroll_manager.cc
@@ -4,9 +4,8 @@
#include "third_party/blink/renderer/core/input/scroll_manager.h"
-#include <memory>
+#include <utility>
-#include "cc/input/scroll_snap_data.h"
#include "third_party/blink/renderer/core/dom/dom_node_ids.h"
#include "third_party/blink/renderer/core/dom/node_computed_style.h"
#include "third_party/blink/renderer/core/events/gesture_event.h"
@@ -36,22 +35,22 @@
namespace blink {
namespace {
-SnapFlingController::GestureScrollType ToGestureScrollType(
+cc::SnapFlingController::GestureScrollType ToGestureScrollType(
WebInputEvent::Type web_event_type) {
switch (web_event_type) {
case WebInputEvent::kGestureScrollBegin:
- return SnapFlingController::GestureScrollType::kBegin;
+ return cc::SnapFlingController::GestureScrollType::kBegin;
case WebInputEvent::kGestureScrollUpdate:
- return SnapFlingController::GestureScrollType::kUpdate;
+ return cc::SnapFlingController::GestureScrollType::kUpdate;
case WebInputEvent::kGestureScrollEnd:
- return SnapFlingController::GestureScrollType::kEnd;
+ return cc::SnapFlingController::GestureScrollType::kEnd;
default:
NOTREACHED();
- return SnapFlingController::GestureScrollType::kBegin;
+ return cc::SnapFlingController::GestureScrollType::kBegin;
}
}
-SnapFlingController::GestureScrollUpdateInfo GetGestureScrollUpdateInfo(
+cc::SnapFlingController::GestureScrollUpdateInfo GetGestureScrollUpdateInfo(
const WebGestureEvent& event) {
return {.delta = gfx::Vector2dF(-event.data.scroll_update.delta_x,
-event.data.scroll_update.delta_y),
diff --git a/third_party/blink/renderer/core/input/scroll_manager.h b/third_party/blink/renderer/core/input/scroll_manager.h
index c76f8eb..87c38626 100644
--- a/third_party/blink/renderer/core/input/scroll_manager.h
+++ b/third_party/blink/renderer/core/input/scroll_manager.h
@@ -6,8 +6,10 @@
#define THIRD_PARTY_BLINK_RENDERER_CORE_INPUT_SCROLL_MANAGER_H_
#include <deque>
+#include <memory>
#include "base/macros.h"
+#include "cc/input/snap_fling_controller.h"
#include "third_party/blink/public/platform/web_input_event_result.h"
#include "third_party/blink/renderer/core/core_export.h"
#include "third_party/blink/renderer/core/dom/dom_node_ids.h"
@@ -173,7 +175,7 @@
Member<PaintLayerScrollableArea> resize_scrollable_area_;
- std::unique_ptr<SnapFlingController> snap_fling_controller_;
+ std::unique_ptr<cc::SnapFlingController> snap_fling_controller_;
LayoutSize
offset_from_resize_corner_; // In the coords of m_resizeScrollableArea.
diff --git a/third_party/blink/renderer/platform/scroll/scroll_snap_data.h b/third_party/blink/renderer/platform/scroll/scroll_snap_data.h
index bd99828..3d53825 100644
--- a/third_party/blink/renderer/platform/scroll/scroll_snap_data.h
+++ b/third_party/blink/renderer/platform/scroll/scroll_snap_data.h
@@ -14,7 +14,6 @@
namespace blink {
using SearchAxis = cc::SearchAxis;
-using SnapFlingController = cc::SnapFlingController;
using SnapFlingClient = cc::SnapFlingClient;
} // namespace blink
diff --git a/third_party/blink/tools/blinkpy/presubmit/audit_non_blink_usage.py b/third_party/blink/tools/blinkpy/presubmit/audit_non_blink_usage.py
index 51a23a9..757303ec 100755
--- a/third_party/blink/tools/blinkpy/presubmit/audit_non_blink_usage.py
+++ b/third_party/blink/tools/blinkpy/presubmit/audit_non_blink_usage.py
@@ -240,6 +240,7 @@
'cc::SnapAreaData',
'cc::SnapAxis',
'cc::SnapContainerData',
+ 'cc::SnapFlingController',
'cc::SnapSelectionStrategy',
'cc::SnapStrictness',
'gfx::RectToSkRect',
