diff --git a/Ladybird/AppKit/UI/LadybirdWebViewBridge.cpp b/Ladybird/AppKit/UI/LadybirdWebViewBridge.cpp index b0466bd499..3bef8c8a21 100644 --- a/Ladybird/AppKit/UI/LadybirdWebViewBridge.cpp +++ b/Ladybird/AppKit/UI/LadybirdWebViewBridge.cpp @@ -133,10 +133,6 @@ Optional WebViewBridge::paintable() return Paintable { *bitmap, bitmap_size }; } -void WebViewBridge::notify_server_did_finish_handling_input_event(bool) -{ -} - void WebViewBridge::update_zoom() { } diff --git a/Ladybird/AppKit/UI/LadybirdWebViewBridge.h b/Ladybird/AppKit/UI/LadybirdWebViewBridge.h index b23e6ead77..5e923cd309 100644 --- a/Ladybird/AppKit/UI/LadybirdWebViewBridge.h +++ b/Ladybird/AppKit/UI/LadybirdWebViewBridge.h @@ -52,8 +52,6 @@ public: private: WebViewBridge(Vector screen_rects, float device_pixel_ratio, Optional webdriver_content_ipc_path); - virtual void notify_server_did_finish_handling_input_event(bool event_was_accepted) override; - virtual void update_zoom() override; virtual Gfx::IntRect viewport_rect() const override; virtual Gfx::IntPoint to_content_position(Gfx::IntPoint widget_position) const override; diff --git a/Ladybird/Qt/WebContentView.cpp b/Ladybird/Qt/WebContentView.cpp index 92ef3ae4b0..3f9b5534b5 100644 --- a/Ladybird/Qt/WebContentView.cpp +++ b/Ladybird/Qt/WebContentView.cpp @@ -736,13 +736,6 @@ bool WebContentView::event(QEvent* event) return QAbstractScrollArea::event(event); } -void WebContentView::notify_server_did_finish_handling_input_event(bool event_was_accepted) -{ - // FIXME: Currently Ladybird handles the keyboard shortcuts before passing the event to web content, so - // we don't need to do anything here. But we'll need to once we start asking web content first. - (void)event_was_accepted; -} - ErrorOr WebContentView::dump_layout_tree() { return String::from_deprecated_string(client().dump_layout_tree()); diff --git a/Ladybird/Qt/WebContentView.h b/Ladybird/Qt/WebContentView.h index b4a240cc13..b35ce04ad1 100644 --- a/Ladybird/Qt/WebContentView.h +++ b/Ladybird/Qt/WebContentView.h @@ -76,8 +76,6 @@ public: }; void update_palette(PaletteMode = PaletteMode::Default); - virtual void notify_server_did_finish_handling_input_event(bool event_was_accepted) override; - signals: void urls_dropped(QList const&); diff --git a/Userland/Libraries/LibWebView/OutOfProcessWebView.cpp b/Userland/Libraries/LibWebView/OutOfProcessWebView.cpp index 015de00f79..4b8a6088a3 100644 --- a/Userland/Libraries/LibWebView/OutOfProcessWebView.cpp +++ b/Userland/Libraries/LibWebView/OutOfProcessWebView.cpp @@ -71,6 +71,10 @@ OutOfProcessWebView::OutOfProcessWebView() on_leave_tooltip_area = []() { GUI::Application::the()->hide_tooltip(); }; + + on_finish_handling_input_event = [this](auto event_was_accepted) { + did_finish_handling_input_event(event_was_accepted); + }; } OutOfProcessWebView::~OutOfProcessWebView() = default; @@ -350,7 +354,7 @@ void OutOfProcessWebView::process_next_input_event() }); } -void OutOfProcessWebView::notify_server_did_finish_handling_input_event(bool event_was_accepted) +void OutOfProcessWebView::did_finish_handling_input_event(bool event_was_accepted) { VERIFY(m_is_awaiting_response_for_input_event); diff --git a/Userland/Libraries/LibWebView/OutOfProcessWebView.h b/Userland/Libraries/LibWebView/OutOfProcessWebView.h index 73e08b1c3b..35711a8e56 100644 --- a/Userland/Libraries/LibWebView/OutOfProcessWebView.h +++ b/Userland/Libraries/LibWebView/OutOfProcessWebView.h @@ -82,7 +82,6 @@ private: // ^WebView::ViewImplementation virtual void create_client(EnableCallgrindProfiling = EnableCallgrindProfiling::No) override; virtual void update_zoom() override; - virtual void notify_server_did_finish_handling_input_event(bool event_was_accepted) override; virtual Gfx::IntRect viewport_rect() const override; virtual Gfx::IntPoint to_content_position(Gfx::IntPoint widget_position) const override; @@ -91,6 +90,7 @@ private: using InputEvent = Variant; void enqueue_input_event(InputEvent const&); void process_next_input_event(); + void did_finish_handling_input_event(bool event_was_accepted); bool m_is_awaiting_response_for_input_event { false }; Queue m_pending_input_events; diff --git a/Userland/Libraries/LibWebView/ViewImplementation.h b/Userland/Libraries/LibWebView/ViewImplementation.h index 7d32b5393a..f437c6b500 100644 --- a/Userland/Libraries/LibWebView/ViewImplementation.h +++ b/Userland/Libraries/LibWebView/ViewImplementation.h @@ -145,8 +145,7 @@ public: Function on_maximize_window; Function on_minimize_window; Function on_fullscreen_window; - - virtual void notify_server_did_finish_handling_input_event(bool event_was_accepted) = 0; + Function on_finish_handling_input_event; virtual Gfx::IntRect viewport_rect() const = 0; virtual Gfx::IntPoint to_content_position(Gfx::IntPoint widget_position) const = 0; diff --git a/Userland/Libraries/LibWebView/WebContentClient.cpp b/Userland/Libraries/LibWebView/WebContentClient.cpp index 087813df1c..e0fef7f524 100644 --- a/Userland/Libraries/LibWebView/WebContentClient.cpp +++ b/Userland/Libraries/LibWebView/WebContentClient.cpp @@ -380,7 +380,8 @@ void WebContentClient::did_request_file(DeprecatedString const& path, i32 reques void WebContentClient::did_finish_handling_input_event(bool event_was_accepted) { - m_view.notify_server_did_finish_handling_input_event(event_was_accepted); + if (m_view.on_finish_handling_input_event) + m_view.on_finish_handling_input_event(event_was_accepted); } } diff --git a/Userland/Utilities/headless-browser.cpp b/Userland/Utilities/headless-browser.cpp index a289cc2df6..dfbea4eb33 100644 --- a/Userland/Utilities/headless-browser.cpp +++ b/Userland/Utilities/headless-browser.cpp @@ -102,7 +102,6 @@ public: private: HeadlessWebContentView() = default; - void notify_server_did_finish_handling_input_event(bool) override { } void update_zoom() override { } void create_client(WebView::EnableCallgrindProfiling) override { }