1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 14:57:35 +00:00

LibWeb+WebContent: Create WebContentConsoleClient for every document

Fixes regression introduced in b4fe118dff

The `WebContentConsoleClient` needs to be created not just once, but
for every new document. Although the JS Console window allows
communication only with the active document associated with the
top-level browsing context, we still need a console client for each
iframe's document to ensure their console logs are printed.

In the future, we might consider adding the ability to switch which
document the JS Console window communicates with.

Fixes https://github.com/SerenityOS/serenity/issues/21117
This commit is contained in:
Aliaksandr Kalenik 2023-09-17 16:11:16 +02:00 committed by Andreas Kling
parent 9a61041941
commit a76ef04ae6
7 changed files with 34 additions and 15 deletions

View file

@ -2652,6 +2652,8 @@ Vector<JS::Handle<HTML::BrowsingContext>> Document::list_of_descendant_browsing_
// https://html.spec.whatwg.org/multipage/document-lifecycle.html#destroy-a-document
void Document::destroy()
{
page()->client().page_did_destroy_document(*this);
// NOTE: Abort needs to happen before destory. There is currently bug in the spec: https://github.com/whatwg/html/issues/9148
// 4. Abort document.
abort();

View file

@ -203,6 +203,7 @@ public:
virtual Gfx::IntRect page_did_request_fullscreen_window() { return {}; }
virtual void page_did_start_loading(const AK::URL&, bool is_redirect) { (void)is_redirect; }
virtual void page_did_create_new_document(Web::DOM::Document&) { }
virtual void page_did_destroy_document(Web::DOM::Document&) { }
virtual void page_did_finish_loading(const AK::URL&) { }
virtual void page_did_change_selection() { }
virtual void page_did_request_cursor_change(Gfx::StandardCursor) { }

View file

@ -649,21 +649,28 @@ Messages::WebContentServer::GetHoveredNodeIdResponse ConnectionFromClient::get_h
void ConnectionFromClient::initialize_js_console(Badge<PageHost>, Web::DOM::Document& document)
{
auto realm = document.realm().make_weak_ptr();
if (m_realm.ptr() == realm.ptr())
return;
auto& realm = document.realm();
auto console_object = realm.intrinsics().console_object();
auto console_client = make<WebContentConsoleClient>(console_object->console(), document.realm(), *this);
console_object->console().set_client(*console_client);
auto console_object = realm->intrinsics().console_object();
m_realm = realm;
if (!m_console_client)
m_console_client = make<WebContentConsoleClient>(console_object->console(), *m_realm, *this);
console_object->console().set_client(*m_console_client.ptr());
VERIFY(document.browsing_context());
if (document.browsing_context()->is_top_level()) {
m_top_level_document_console_client = console_client->make_weak_ptr();
}
m_console_clients.set(&document, move(console_client));
}
void ConnectionFromClient::destroy_js_console(Badge<PageHost>, Web::DOM::Document& document)
{
m_console_clients.remove(&document);
}
void ConnectionFromClient::js_console_input(DeprecatedString const& js_source)
{
if (m_console_client)
m_console_client->handle_input(js_source);
if (m_top_level_document_console_client)
m_top_level_document_console_client->handle_input(js_source);
}
void ConnectionFromClient::run_javascript(DeprecatedString const& js_source)
@ -695,8 +702,8 @@ void ConnectionFromClient::run_javascript(DeprecatedString const& js_source)
void ConnectionFromClient::js_console_request_messages(i32 start_index)
{
if (m_console_client)
m_console_client->send_messages(start_index);
if (m_top_level_document_console_client)
m_top_level_document_console_client->send_messages(start_index);
}
Messages::WebContentServer::TakeDocumentScreenshotResponse ConnectionFromClient::take_document_screenshot()

View file

@ -34,6 +34,7 @@ public:
virtual void die() override;
void initialize_js_console(Badge<PageHost>, Web::DOM::Document& document);
void destroy_js_console(Badge<PageHost>, Web::DOM::Document& document);
void request_file(Web::FileRequest);
@ -127,8 +128,9 @@ private:
HashMap<i32, NonnullRefPtr<Gfx::Bitmap>> m_backing_stores;
WeakPtr<JS::Realm> m_realm;
OwnPtr<WebContentConsoleClient> m_console_client;
HashMap<Web::DOM::Document*, NonnullOwnPtr<WebContentConsoleClient>> m_console_clients;
WeakPtr<WebContentConsoleClient> m_top_level_document_console_client;
JS::Handle<JS::GlobalObject> m_console_global_object;
HashMap<int, Web::FileRequest> m_requested_files {};

View file

@ -287,6 +287,11 @@ void PageHost::page_did_create_new_document(Web::DOM::Document& document)
m_client.initialize_js_console({}, document);
}
void PageHost::page_did_destroy_document(Web::DOM::Document& document)
{
m_client.destroy_js_console({}, document);
}
void PageHost::page_did_finish_loading(const URL& url)
{
m_client.async_did_finish_loading(url);

View file

@ -94,6 +94,7 @@ private:
virtual void page_did_request_media_context_menu(Web::CSSPixelPoint, DeprecatedString const& target, unsigned modifiers, Web::Page::MediaContextMenu) override;
virtual void page_did_start_loading(const URL&, bool) override;
virtual void page_did_create_new_document(Web::DOM::Document&) override;
virtual void page_did_destroy_document(Web::DOM::Document&) override;
virtual void page_did_finish_loading(const URL&) override;
virtual void page_did_request_alert(String const&) override;
virtual void page_did_request_confirm(String const&) override;

View file

@ -16,7 +16,8 @@
namespace WebContent {
class WebContentConsoleClient final : public JS::ConsoleClient {
class WebContentConsoleClient final : public JS::ConsoleClient
, public Weakable<WebContentConsoleClient> {
public:
WebContentConsoleClient(JS::Console&, JS::Realm&, ConnectionFromClient&);