Skip to content

Commit

Permalink
Delete blink::OverscrollController.
Browse files Browse the repository at this point in the history
Bug: 1369739
Change-Id: I4472ce48aed760a4b45521d0094cc88fb8003a3f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4930272
Commit-Queue: Steve Kobes <skobes@chromium.org>
Reviewed-by: David Awogbemila <awogbemila@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1208886}
  • Loading branch information
skobes-chromium authored and Chromium LUCI CQ committed Oct 12, 2023
1 parent f58e030 commit 061e06b
Show file tree
Hide file tree
Showing 9 changed files with 1 addition and 169 deletions.
1 change: 0 additions & 1 deletion third_party/blink/renderer/core/dom/document.cc
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,6 @@
#include "third_party/blink/renderer/core/page/plugin_script_forbidden_scope.h"
#include "third_party/blink/renderer/core/page/pointer_lock_controller.h"
#include "third_party/blink/renderer/core/page/scrolling/fragment_anchor.h"
#include "third_party/blink/renderer/core/page/scrolling/overscroll_controller.h"
#include "third_party/blink/renderer/core/page/scrolling/root_scroller_controller.h"
#include "third_party/blink/renderer/core/page/scrolling/scrolling_coordinator.h"
#include "third_party/blink/renderer/core/page/scrolling/snap_coordinator.h"
Expand Down
14 changes: 1 addition & 13 deletions third_party/blink/renderer/core/input/scroll_manager.cc
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
#include "third_party/blink/renderer/core/page/autoscroll_controller.h"
#include "third_party/blink/renderer/core/page/chrome_client.h"
#include "third_party/blink/renderer/core/page/page.h"
#include "third_party/blink/renderer/core/page/scrolling/overscroll_controller.h"
#include "third_party/blink/renderer/core/page/scrolling/root_scroller_controller.h"
#include "third_party/blink/renderer/core/page/scrolling/scroll_state.h"
#include "third_party/blink/renderer/core/page/scrolling/scrolling_coordinator.h"
Expand All @@ -50,7 +49,7 @@ void ScrollManager::Clear() {
scrollbar_handling_scroll_gesture_ = nullptr;
resize_scrollable_area_ = nullptr;
offset_from_resize_corner_ = {};
ClearGestureScrollState();
scroll_gesture_handling_node_ = nullptr;
}

void ScrollManager::Trace(Visitor* visitor) const {
Expand All @@ -60,16 +59,6 @@ void ScrollManager::Trace(Visitor* visitor) const {
visitor->Trace(resize_scrollable_area_);
}

void ScrollManager::ClearGestureScrollState() {
scroll_gesture_handling_node_ = nullptr;

if (Page* page = frame_->GetPage()) {
bool reset_x = true;
bool reset_y = true;
page->GetOverscrollController().ResetAccumulated(reset_x, reset_y);
}
}

void ScrollManager::StopAutoscroll() {
if (AutoscrollController* controller = GetAutoscrollController())
controller->StopAutoscroll();
Expand Down Expand Up @@ -456,7 +445,6 @@ WebInputEventResult ScrollManager::HandleGestureScrollEvent(
return WebInputEventResult::kNotHandled;
}

ClearGestureScrollState();
scroll_gesture_handling_node_ = event_target;
}

Expand Down
2 changes: 0 additions & 2 deletions third_party/blink/renderer/core/input/scroll_manager.h
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,6 @@ class CORE_EXPORT ScrollManager : public GarbageCollected<ScrollManager> {
Node* NodeTargetForScrollableAreaElementId(
CompositorElementId scrollable_area_element_id) const;

void ClearGestureScrollState();

bool HandleScrollGestureOnResizer(Node*, const WebGestureEvent&);

void RecomputeScrollChain(const Node& start_node,
Expand Down
2 changes: 0 additions & 2 deletions third_party/blink/renderer/core/page/build.gni
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,6 @@ blink_core_sources_page = [
"scrolling/element_fragment_anchor.h",
"scrolling/fragment_anchor.cc",
"scrolling/fragment_anchor.h",
"scrolling/overscroll_controller.cc",
"scrolling/overscroll_controller.h",
"scrolling/root_scroller_controller.cc",
"scrolling/root_scroller_controller.h",
"scrolling/scroll_state.cc",
Expand Down
13 changes: 0 additions & 13 deletions third_party/blink/renderer/core/page/page.cc
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,6 @@
#include "third_party/blink/renderer/core/page/pointer_lock_controller.h"
#include "third_party/blink/renderer/core/page/scoped_browsing_context_group_pauser.h"
#include "third_party/blink/renderer/core/page/scoped_page_pauser.h"
#include "third_party/blink/renderer/core/page/scrolling/overscroll_controller.h"
#include "third_party/blink/renderer/core/page/scrolling/scrolling_coordinator.h"
#include "third_party/blink/renderer/core/page/scrolling/top_document_root_scroller_controller.h"
#include "third_party/blink/renderer/core/page/spatial_navigation_controller.h"
Expand Down Expand Up @@ -213,9 +212,6 @@ Page::Page(base::PassKey<Page>,
global_root_scroller_controller_(
MakeGarbageCollected<TopDocumentRootScrollerController>(*this)),
visual_viewport_(MakeGarbageCollected<VisualViewport>(*this)),
overscroll_controller_(
MakeGarbageCollected<OverscrollController>(GetVisualViewport(),
GetChromeClient())),
link_highlight_(MakeGarbageCollected<LinkHighlight>(*this)),
plugin_data_(nullptr),
// TODO(pdr): Initialize |validation_message_client_| lazily.
Expand Down Expand Up @@ -331,14 +327,6 @@ const VisualViewport& Page::GetVisualViewport() const {
return *visual_viewport_;
}

OverscrollController& Page::GetOverscrollController() {
return *overscroll_controller_;
}

const OverscrollController& Page::GetOverscrollController() const {
return *overscroll_controller_;
}

LinkHighlight& Page::GetLinkHighlight() {
return *link_highlight_;
}
Expand Down Expand Up @@ -957,7 +945,6 @@ void Page::Trace(Visitor* visitor) const {
visitor->Trace(console_message_storage_);
visitor->Trace(global_root_scroller_controller_);
visitor->Trace(visual_viewport_);
visitor->Trace(overscroll_controller_);
visitor->Trace(link_highlight_);
visitor->Trace(spatial_navigation_controller_);
visitor->Trace(main_frame_);
Expand Down
5 changes: 0 additions & 5 deletions third_party/blink/renderer/core/page/page.h
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,6 @@ class LinkHighlight;
class LocalFrame;
class LocalFrameView;
class MediaFeatureOverrides;
class OverscrollController;
class PageAnimator;
struct PageScaleConstraints;
class PageScaleConstraintsSet;
Expand Down Expand Up @@ -258,9 +257,6 @@ class CORE_EXPORT Page final : public GarbageCollected<Page>,

LinkHighlight& GetLinkHighlight();

OverscrollController& GetOverscrollController();
const OverscrollController& GetOverscrollController() const;

void SetTabKeyCyclesThroughElements(bool b) {
tab_key_cycles_through_elements_ = b;
}
Expand Down Expand Up @@ -514,7 +510,6 @@ class CORE_EXPORT Page final : public GarbageCollected<Page>,
const Member<TopDocumentRootScrollerController>
global_root_scroller_controller_;
const Member<VisualViewport> visual_viewport_;
const Member<OverscrollController> overscroll_controller_;
const Member<LinkHighlight> link_highlight_;
Member<SpatialNavigationController> spatial_navigation_controller_;

Expand Down

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
#include "third_party/blink/renderer/core/layout/layout_view.h"
#include "third_party/blink/renderer/core/page/chrome_client.h"
#include "third_party/blink/renderer/core/page/page.h"
#include "third_party/blink/renderer/core/page/scrolling/overscroll_controller.h"
#include "third_party/blink/renderer/core/paint/paint_layer.h"
#include "third_party/blink/renderer/core/paint/paint_layer_scrollable_area.h"
#include "third_party/blink/renderer/core/scroll/scrollable_area.h"
Expand Down

0 comments on commit 061e06b

Please sign in to comment.