From 9624eca11603375c32768c9369f212ea9692e482 Mon Sep 17 00:00:00 2001 From: Aliaksandr Kalenik Date: Mon, 18 Dec 2023 21:45:29 +0100 Subject: [PATCH] LibWeb+LibWebView+WebContent: Remove unused request_scroll_into_view `Element::scroll_into_view()` is supposed to be used instead. --- Userland/Libraries/LibWeb/Page/Page.h | 1 - Userland/Libraries/LibWebView/WebContentClient.cpp | 7 ------- Userland/Libraries/LibWebView/WebContentClient.h | 1 - Userland/Services/WebContent/PageClient.cpp | 9 --------- Userland/Services/WebContent/PageClient.h | 1 - Userland/Services/WebContent/WebContentClient.ipc | 1 - 6 files changed, 20 deletions(-) diff --git a/Userland/Libraries/LibWeb/Page/Page.h b/Userland/Libraries/LibWeb/Page/Page.h index 7fd2d11737..c78f0224a1 100644 --- a/Userland/Libraries/LibWeb/Page/Page.h +++ b/Userland/Libraries/LibWeb/Page/Page.h @@ -255,7 +255,6 @@ public: virtual void page_did_layout() { } virtual void page_did_request_scroll(i32, i32) { } virtual void page_did_request_scroll_to(CSSPixelPoint) { } - virtual void page_did_request_scroll_into_view(CSSPixelRect const&) { } virtual void page_did_request_alert(String const&) { } virtual void page_did_request_confirm(String const&) { } virtual void page_did_request_prompt(String const&, String const&) { } diff --git a/Userland/Libraries/LibWebView/WebContentClient.cpp b/Userland/Libraries/LibWebView/WebContentClient.cpp index 51d77c0e69..cb20d48d0a 100644 --- a/Userland/Libraries/LibWebView/WebContentClient.cpp +++ b/Userland/Libraries/LibWebView/WebContentClient.cpp @@ -125,13 +125,6 @@ void WebContentClient::did_request_scroll_to(Gfx::IntPoint scroll_position) m_view.on_scroll_to_point(scroll_position); } -void WebContentClient::did_request_scroll_into_view(Gfx::IntRect const& rect) -{ - dbgln_if(SPAM_DEBUG, "handle: WebContentClient::DidRequestScrollIntoView! rect={}", rect); - if (m_view.on_scroll_into_view) - m_view.on_scroll_into_view(rect); -} - void WebContentClient::did_enter_tooltip_area(Gfx::IntPoint content_position, ByteString const& title) { if (m_view.on_enter_tooltip_area) diff --git a/Userland/Libraries/LibWebView/WebContentClient.h b/Userland/Libraries/LibWebView/WebContentClient.h index a1a281db42..c88d9c83b9 100644 --- a/Userland/Libraries/LibWebView/WebContentClient.h +++ b/Userland/Libraries/LibWebView/WebContentClient.h @@ -42,7 +42,6 @@ private: virtual void did_change_title(ByteString const&) override; virtual void did_request_scroll(i32, i32) override; virtual void did_request_scroll_to(Gfx::IntPoint) override; - virtual void did_request_scroll_into_view(Gfx::IntRect const&) override; virtual void did_enter_tooltip_area(Gfx::IntPoint, ByteString const&) override; virtual void did_leave_tooltip_area() override; virtual void did_hover_link(AK::URL const&) override; diff --git a/Userland/Services/WebContent/PageClient.cpp b/Userland/Services/WebContent/PageClient.cpp index 411a0c8380..25a9463282 100644 --- a/Userland/Services/WebContent/PageClient.cpp +++ b/Userland/Services/WebContent/PageClient.cpp @@ -285,15 +285,6 @@ void PageClient::page_did_request_scroll_to(Web::CSSPixelPoint scroll_position) client().async_did_request_scroll_to(device_scroll_position.to_type()); } -void PageClient::page_did_request_scroll_into_view(Web::CSSPixelRect const& rect) -{ - auto device_pixel_rect = page().enclosing_device_rect(rect); - client().async_did_request_scroll_into_view({ device_pixel_rect.x().value(), - device_pixel_rect.y().value(), - device_pixel_rect.width().value(), - device_pixel_rect.height().value() }); -} - void PageClient::page_did_enter_tooltip_area(Web::CSSPixelPoint content_position, ByteString const& title) { client().async_did_enter_tooltip_area({ content_position.x().to_int(), content_position.y().to_int() }, title); diff --git a/Userland/Services/WebContent/PageClient.h b/Userland/Services/WebContent/PageClient.h index da7a4ab4e4..0076d59559 100644 --- a/Userland/Services/WebContent/PageClient.h +++ b/Userland/Services/WebContent/PageClient.h @@ -90,7 +90,6 @@ private: virtual Gfx::IntRect page_did_request_fullscreen_window() override; virtual void page_did_request_scroll(i32, i32) override; virtual void page_did_request_scroll_to(Web::CSSPixelPoint) override; - virtual void page_did_request_scroll_into_view(Web::CSSPixelRect const&) override; virtual void page_did_enter_tooltip_area(Web::CSSPixelPoint, ByteString const&) override; virtual void page_did_leave_tooltip_area() override; virtual void page_did_hover_link(const URL&) override; diff --git a/Userland/Services/WebContent/WebContentClient.ipc b/Userland/Services/WebContent/WebContentClient.ipc index 402eb8dcf0..1a0379c339 100644 --- a/Userland/Services/WebContent/WebContentClient.ipc +++ b/Userland/Services/WebContent/WebContentClient.ipc @@ -25,7 +25,6 @@ endpoint WebContentClient did_change_title(ByteString title) =| did_request_scroll(i32 x_delta, i32 y_delta) =| did_request_scroll_to(Gfx::IntPoint scroll_position) =| - did_request_scroll_into_view(Gfx::IntRect rect) =| did_enter_tooltip_area(Gfx::IntPoint content_position, ByteString title) =| did_leave_tooltip_area() =| did_hover_link(URL url) =|