RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 21:08:12 +00:00
Code Issues Activity Actions

Ladybird+LibWebView: Migrate layout notification to LibWebView callbacks

Browse source
This commit is contained in:
Timothy Flynn 2023-08-23 10:33:26 -04:00 • committed by Tim Flynn
parent 682a5f9b70
commit bf464665a7
10 changed files with 19 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Ladybird/AppKit/UI/LadybirdWebView.mm
View file

@ -164,9 +164,9 @@ struct HideCursor {
- (void)setWebViewCallbacks
{
m_web_view_bridge->on_layout = [self](auto content_size) {
auto ns_content_size = Ladybird::gfx_size_to_ns_size(content_size);
[[self documentView] setFrameSize:ns_content_size];
m_web_view_bridge->on_did_layout = [self](auto content_size) {
auto inverse_device_pixel_ratio = m_web_view_bridge->inverse_device_pixel_ratio();
[[self documentView] setFrameSize:NSMakeSize(content_size.width() * inverse_device_pixel_ratio, content_size.height() * inverse_device_pixel_ratio)];
};
m_web_view_bridge->on_ready_to_paint = [self]() {

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

@ -104,14 +104,6 @@ Optional<WebViewBridge::Paintable> WebViewBridge::paintable()
return Paintable { *bitmap, bitmap_size };
}
void WebViewBridge::notify_server_did_layout(Badge<WebView::WebContentClient>, Gfx::IntSize content_size)
{
if (on_layout) {
content_size = scale_for_device(content_size, m_inverse_device_pixel_ratio);
on_layout(content_size);
}
}
void WebViewBridge::notify_server_did_request_cursor_change(Badge<WebView::WebContentClient>, Gfx::StandardCursor cursor)
{
if (on_cursor_change)

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

@ -49,8 +49,6 @@ public:
};
Optional<Paintable> paintable();
Function<void(Gfx::IntSize)> on_layout;
Function<void(Gfx::IntPoint)> on_scroll;
Function<void(Gfx::StandardCursor)> on_cursor_change;
@ -61,7 +59,6 @@ public:
private:
WebViewBridge(Vector<Gfx::IntRect> screen_rects, float device_pixel_ratio, Optional<StringView> webdriver_content_ipc_path);
virtual void notify_server_did_layout(Badge<WebView::WebContentClient>, Gfx::IntSize content_size) override;
virtual void notify_server_did_request_cursor_change(Badge<WebView::WebContentClient>, Gfx::StandardCursor cursor) override;
virtual void notify_server_did_request_scroll(Badge<WebView::WebContentClient>, i32, i32) override;
virtual void notify_server_did_request_scroll_to(Badge<WebView::WebContentClient>, Gfx::IntPoint) override;

19
Ladybird/Qt/WebContentView.cpp
View file

@ -76,6 +76,15 @@ WebContentView::WebContentView(StringView webdriver_content_ipc_path, WebView::E
create_client(enable_callgrind_profiling);
on_did_layout = [this](auto content_size) {
verticalScrollBar()->setMinimum(0);
verticalScrollBar()->setMaximum(content_size.height() - m_viewport_rect.height());
verticalScrollBar()->setPageStep(m_viewport_rect.height());
horizontalScrollBar()->setMinimum(0);
horizontalScrollBar()->setMaximum(content_size.width() - m_viewport_rect.width());
horizontalScrollBar()->setPageStep(m_viewport_rect.width());
};
on_ready_to_paint = [this]() {
viewport()->update();
};
@ -654,16 +663,6 @@ void WebContentView::notify_server_did_request_cursor_change(Badge<WebContentCli
}
}
void WebContentView::notify_server_did_layout(Badge<WebContentClient>, Gfx::IntSize content_size)
{
verticalScrollBar()->setMinimum(0);
verticalScrollBar()->setMaximum(content_size.height() - m_viewport_rect.height());
verticalScrollBar()->setPageStep(m_viewport_rect.height());
horizontalScrollBar()->setMinimum(0);
horizontalScrollBar()->setMaximum(content_size.width() - m_viewport_rect.width());
horizontalScrollBar()->setPageStep(m_viewport_rect.width());
}
void WebContentView::notify_server_did_request_scroll(Badge<WebContentClient>, i32 x_delta, i32 y_delta)
{
horizontalScrollBar()->setValue(max(0, horizontalScrollBar()->value() + x_delta));

1
Ladybird/Qt/WebContentView.h
View file

@ -76,7 +76,6 @@ public:
};
void update_palette(PaletteMode = PaletteMode::Default);
virtual void notify_server_did_layout(Badge<WebContentClient>, Gfx::IntSize content_size) override;
virtual void notify_server_did_request_cursor_change(Badge<WebContentClient>, Gfx::StandardCursor cursor) override;
virtual void notify_server_did_request_scroll(Badge<WebContentClient>, i32, i32) override;
virtual void notify_server_did_request_scroll_to(Badge<WebContentClient>, Gfx::IntPoint) override;

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

@ -29,6 +29,10 @@ OutOfProcessWebView::OutOfProcessWebView()
create_client();
on_did_layout = [this](auto content_size) {
set_content_size(content_size);
};
on_ready_to_paint = [this]() {
update();
};
@ -184,11 +188,6 @@ void OutOfProcessWebView::notify_server_did_request_cursor_change(Badge<WebConte
set_override_cursor(cursor);
}
void OutOfProcessWebView::notify_server_did_layout(Badge<WebContentClient>, Gfx::IntSize content_size)
{
set_content_size(content_size);
}
void OutOfProcessWebView::notify_server_did_request_scroll(Badge<WebContentClient>, i32 x_delta, i32 y_delta)
{
horizontal_scrollbar().increase_slider_by(x_delta);

1
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_layout(Badge<WebContentClient>, Gfx::IntSize content_size) override;
virtual void notify_server_did_request_cursor_change(Badge<WebContentClient>, Gfx::StandardCursor cursor) override;
virtual void notify_server_did_request_scroll(Badge<WebContentClient>, i32, i32) override;
virtual void notify_server_did_request_scroll_to(Badge<WebContentClient>, Gfx::IntPoint) override;

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

@ -94,6 +94,7 @@ public:
};
ErrorOr<void> take_screenshot(ScreenshotType);
Function<void(Gfx::IntSize)> on_did_layout;
Function<void()> on_ready_to_paint;
Function<String(Web::HTML::ActivateTab)> on_new_tab;
Function<void()> on_activate_tab;
@ -139,7 +140,6 @@ public:
Function<Gfx::IntRect()> on_minimize_window;
Function<Gfx::IntRect()> on_fullscreen_window;
virtual void notify_server_did_layout(Badge<WebContentClient>, Gfx::IntSize content_size) = 0;
virtual void notify_server_did_request_cursor_change(Badge<WebContentClient>, Gfx::StandardCursor cursor) = 0;
virtual void notify_server_did_request_scroll(Badge<WebContentClient>, i32, i32) = 0;
virtual void notify_server_did_request_scroll_to(Badge<WebContentClient>, Gfx::IntPoint) = 0;

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

@ -88,7 +88,8 @@ void WebContentClient::did_request_cursor_change(i32 cursor_type)
void WebContentClient::did_layout(Gfx::IntSize content_size)
{
dbgln_if(SPAM_DEBUG, "handle: WebContentClient::DidLayout! content_size={}", content_size);
m_view.notify_server_did_layout({}, content_size);
if (m_view.on_did_layout)
m_view.on_did_layout(content_size);
}
void WebContentClient::did_change_title(DeprecatedString const& title)

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

@ -102,7 +102,6 @@ public:
private:
HeadlessWebContentView() = default;
void notify_server_did_layout(Badge<WebView::WebContentClient>, Gfx::IntSize) override { }
void notify_server_did_request_cursor_change(Badge<WebView::WebContentClient>, Gfx::StandardCursor) override { }
void notify_server_did_request_scroll(Badge<WebView::WebContentClient>, i32, i32) override { }
void notify_server_did_request_scroll_to(Badge<WebView::WebContentClient>, Gfx::IntPoint) override { }