RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 01:17:36 +00:00
Code Issues Activity Actions

LibWeb: Defer the handling of WebContent process crashes

Browse source 
Handling crashes synchronously is finicky since we're modifying the
m_client_state struct while in a callback lambda owned by it.
Let's avoid all the footguns here by simply using deferred_invoke()
and handling the crash on next event loop iteration instead.
This commit is contained in:
Andreas Kling 2021-02-22 11:07:40 +01:00
parent 38781cb131
commit e405a8f730
2 changed files with 28 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -52,31 +52,38 @@ OutOfProcessWebView::~OutOfProcessWebView()
{ {
} }
void OutOfProcessWebView::handle_web_content_process_crash()
{
create_client();
ASSERT(m_client_state.client);
// Don't keep a stale backup bitmap around.
m_backup_bitmap = nullptr;
handle_resize();
StringBuilder builder;
builder.append("<html><head><title>Crashed: ");
builder.append(escape_html_entities(m_url.to_string()));
builder.append("</title></head><body>");
builder.append("<h1>Web page crashed");
if (!m_url.host().is_empty()) {
builder.appendff(" on {}", escape_html_entities(m_url.host()));
}
builder.append("</h1>");
builder.appendff("The web page <a href=\"{}\">{}</a> has crashed.<br><br>You can reload the page to try again.", escape_html_entities(m_url.to_string_encoded()), escape_html_entities(m_url.to_string()));
builder.append("</body></html>");
load_html(builder.to_string(), m_url);
}
void OutOfProcessWebView::create_client() void OutOfProcessWebView::create_client()
{ {
m_client_state = {}; m_client_state = {};
m_client_state.client = WebContentClient::construct(*this); m_client_state.client = WebContentClient::construct(*this);
m_client_state.client->on_web_content_process_crash = [this] { m_client_state.client->on_web_content_process_crash = [this] {
create_client(); deferred_invoke([this] {
ASSERT(m_client_state.client); handle_web_content_process_crash();
});
// Don't keep a stale backup bitmap around.
m_backup_bitmap = nullptr;
handle_resize();
StringBuilder builder;
builder.append("<html><head><title>Crashed: ");
builder.append(escape_html_entities(m_url.to_string()));
builder.append("</title></head><body>");
builder.append("<h1>Web page crashed");
if (!m_url.host().is_empty()) {
builder.appendff(" on {}", escape_html_entities(m_url.host()));
}
builder.append("</h1>");
builder.appendff("The web page <a href=\"{}\">{}</a> has crashed.<br><br>You can reload the page to try again.", escape_html_entities(m_url.to_string_encoded()), escape_html_entities(m_url.to_string()));
builder.append("</body></html>");
load_html(builder.to_string(), m_url);
}; };
client().post_message(Messages::WebContentServer::UpdateSystemTheme(Gfx::current_system_theme_buffer())); client().post_message(Messages::WebContentServer::UpdateSystemTheme(Gfx::current_system_theme_buffer()));

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

@ -90,6 +90,8 @@ private:
void create_client(); void create_client();
WebContentClient& client(); WebContentClient& client();
void handle_web_content_process_crash();
URL m_url; URL m_url;
struct ClientState { struct ClientState {