RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-14 09:14:58 +00:00
Code Issues Activity Actions

Ladybird+LibWebView: Migrate input completions to LibWebView callbacks

Browse source
This commit is contained in:
Timothy Flynn 2023-08-23 11:19:21 -04:00 • committed by Tim Flynn
parent 5116e97a9d
commit edec5b1d91
9 changed files with 9 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Ladybird/AppKit/UI/LadybirdWebViewBridge.cpp
View file

@ -133,10 +133,6 @@ Optional<WebViewBridge::Paintable> WebViewBridge::paintable()
return Paintable { *bitmap, bitmap_size };
}
void WebViewBridge::notify_server_did_finish_handling_input_event(bool)
{
}
void WebViewBridge::update_zoom()
{
}

2
Ladybird/AppKit/UI/LadybirdWebViewBridge.h
View file

@ -52,8 +52,6 @@ public:
private:
WebViewBridge(Vector<Gfx::IntRect> screen_rects, float device_pixel_ratio, Optional<StringView> 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;

7
Ladybird/Qt/WebContentView.cpp
View file

@ -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<String> WebContentView::dump_layout_tree()
{
return String::from_deprecated_string(client().dump_layout_tree());

2
Ladybird/Qt/WebContentView.h
View file

@ -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<QUrl> const&);

6
Userland/Libraries/LibWebView/OutOfProcessWebView.cpp
View file

@ -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);

2
Userland/Libraries/LibWebView/OutOfProcessWebView.h
View file

@ -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<GUI::KeyEvent, GUI::MouseEvent>;
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<InputEvent> m_pending_input_events;

3
Userland/Libraries/LibWebView/ViewImplementation.h
View file

@ -145,8 +145,7 @@ public:
Function<Gfx::IntRect()> on_maximize_window;
Function<Gfx::IntRect()> on_minimize_window;
Function<Gfx::IntRect()> on_fullscreen_window;
virtual void notify_server_did_finish_handling_input_event(bool event_was_accepted) = 0;
Function<void(bool)> on_finish_handling_input_event;
virtual Gfx::IntRect viewport_rect() const = 0;
virtual Gfx::IntPoint to_content_position(Gfx::IntPoint widget_position) const = 0;

3
Userland/Libraries/LibWebView/WebContentClient.cpp
View file

@ -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);
}
}

1
Userland/Utilities/headless-browser.cpp
View file

@ -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 { }