RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-23 06:07:34 +00:00
Code Issues Activity Actions

LibWeb: Make OOPWV resizing flicker-free :^)

Browse source 
When resizing, keep a copy of the last good bitmap we have, and keep
using that until we receive a new one from the WebContent process.
This commit is contained in:
Andreas Kling 2021-02-09 22:07:36 +01:00
parent 8c220dee03
commit c9aa7539a6
2 changed files with 18 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

23
Userland/Libraries/LibWeb/OutOfProcessWebView.cpp
View file

@ -59,6 +59,10 @@ void OutOfProcessWebView::create_client()
m_client_state.client->on_web_content_process_crash = [this] { m_client_state.client->on_web_content_process_crash = [this] {
create_client(); create_client();
ASSERT(m_client_state.client); ASSERT(m_client_state.client);
// Don't keep a stale backup bitmap around.
m_backup_bitmap = nullptr;
handle_resize(); handle_resize();
StringBuilder builder; StringBuilder builder;
builder.append("<html><head><title>Crashed: "); builder.append("<html><head><title>Crashed: ");
@ -106,16 +110,14 @@ void OutOfProcessWebView::paint_event(GUI::PaintEvent& event)
GUI::Painter painter(*this); GUI::Painter painter(*this);
painter.add_clip_rect(event.rect()); painter.add_clip_rect(event.rect());
if (!m_client_state.has_usable_bitmap) { if (auto* bitmap = m_client_state.has_usable_bitmap ? m_client_state.front_bitmap.ptr() : m_backup_bitmap.ptr()) {
painter.fill_rect(frame_inner_rect(), palette().base()); painter.add_clip_rect(frame_inner_rect());
painter.translate(frame_thickness(), frame_thickness());
painter.blit({ 0, 0 }, *bitmap, bitmap->rect());
return; return;
} }
painter.add_clip_rect(frame_inner_rect()); painter.fill_rect(frame_inner_rect(), palette().base());
painter.translate(frame_thickness(), frame_thickness());
ASSERT(m_client_state.front_bitmap);
painter.blit({ 0, 0 }, *m_client_state.front_bitmap, m_client_state.front_bitmap->rect());
} }
void OutOfProcessWebView::resize_event(GUI::ResizeEvent& event) void OutOfProcessWebView::resize_event(GUI::ResizeEvent& event)
@ -128,6 +130,11 @@ void OutOfProcessWebView::handle_resize()
{ {
client().post_message(Messages::WebContentServer::SetViewportRect(Gfx::IntRect({ horizontal_scrollbar().value(), vertical_scrollbar().value() }, available_size()))); client().post_message(Messages::WebContentServer::SetViewportRect(Gfx::IntRect({ horizontal_scrollbar().value(), vertical_scrollbar().value() }, available_size())));
if (m_client_state.has_usable_bitmap) {
// NOTE: We keep the outgoing front bitmap as a backup so we have something to paint until we get a new one.
m_backup_bitmap = m_client_state.front_bitmap;
}
if (m_client_state.front_bitmap) { if (m_client_state.front_bitmap) {
m_client_state.front_bitmap = nullptr; m_client_state.front_bitmap = nullptr;
client().post_message(Messages::WebContentServer::RemoveBackingStore(m_client_state.front_bitmap_id)); client().post_message(Messages::WebContentServer::RemoveBackingStore(m_client_state.front_bitmap_id));
@ -193,6 +200,8 @@ void OutOfProcessWebView::notify_server_did_paint(Badge<WebContentClient>, i32 b
m_client_state.has_usable_bitmap = true; m_client_state.has_usable_bitmap = true;
swap(m_client_state.back_bitmap, m_client_state.front_bitmap); swap(m_client_state.back_bitmap, m_client_state.front_bitmap);
swap(m_client_state.back_bitmap_id, m_client_state.front_bitmap_id); swap(m_client_state.back_bitmap_id, m_client_state.front_bitmap_id);
// We don't need the backup bitmap anymore, so drop it.
m_backup_bitmap = nullptr;
update(); update();
} }
} }

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

@ -99,6 +99,8 @@ private:
i32 next_bitmap_id { 0 }; i32 next_bitmap_id { 0 };
bool has_usable_bitmap { false }; bool has_usable_bitmap { false };
} m_client_state; } m_client_state;
RefPtr<Gfx::Bitmap> m_backup_bitmap;
}; };
} }