system/serenity
system/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity synced 2024-10-15 04:13:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

LibWeb+WebContent: Set ConsoleClient for nested browsing contexts

Browse source 
Before page_did_create_main_document() only initialized ConsoleClient
for top-level browsing context which means that nested browsing context
could not print into the console.

With this change, ConsoleClient is initialized for documents created
for nested browsing context too. One ConsoleClient is shared between
all browsing contexts within the same page.
This commit is contained in:
Aliaksandr Kalenik 2023-09-07 12:11:37 +02:00 committed by Andrew Kaster
parent 490949c6a8
commit b4fe118dff
6 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Userland/Libraries/LibWeb/Loader/FrameLoader.cpp
View file

@ -325,7 +325,7 @@ void FrameLoader::resource_did_load()
browsing_context().set_active_document(document);
if (auto* page = browsing_context().page())
page->client().page_did_create_main_document();
page->client().page_did_create_new_document(*document);
if (!parse_document(*document, resource()->encoded_data())) {
load_error_page(url, "Failed to parse content.");

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

@ -200,7 +200,7 @@ public:
virtual Gfx::IntRect page_did_request_minimize_window() { return {}; }
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_main_document() { }
virtual void page_did_create_new_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) { }

8
Userland/Services/WebContent/ConnectionFromClient.cpp
View file

@ -601,16 +601,16 @@ Messages::WebContentServer::GetHoveredNodeIdResponse ConnectionFromClient::get_h
return (i32)0;
}
void ConnectionFromClient::initialize_js_console(Badge<PageHost>)
void ConnectionFromClient::initialize_js_console(Badge<PageHost>, Web::DOM::Document& document)
{
auto* document = page().top_level_browsing_context().active_document();
auto realm = document->realm().make_weak_ptr();
auto realm = document.realm().make_weak_ptr();
if (m_realm.ptr() == realm.ptr())
return;
auto console_object = realm->intrinsics().console_object();
m_realm = realm;
m_console_client = make<WebContentConsoleClient>(console_object->console(), *m_realm, *this);
if (!m_console_client)
m_console_client = make<WebContentConsoleClient>(console_object->console(), *m_realm, *this);
console_object->console().set_client(*m_console_client.ptr());
}

2
Userland/Services/WebContent/ConnectionFromClient.h
View file

@ -33,7 +33,7 @@ public:
virtual void die() override;
void initialize_js_console(Badge<PageHost>);
void initialize_js_console(Badge<PageHost>, Web::DOM::Document& document);
void request_file(Web::FileRequest);

4
Userland/Services/WebContent/PageHost.cpp
View file

@ -281,9 +281,9 @@ void PageHost::page_did_start_loading(const URL& url, bool is_redirect)
m_client.async_did_start_loading(url, is_redirect);
}
void PageHost::page_did_create_main_document()
void PageHost::page_did_create_new_document(Web::DOM::Document& document)
{
m_client.initialize_js_console({});
m_client.initialize_js_console({}, document);
}
void PageHost::page_did_finish_loading(const URL& url)

2
Userland/Services/WebContent/PageHost.h
View file

@ -93,7 +93,7 @@ private:
virtual void page_did_request_image_context_menu(Web::CSSPixelPoint, const URL&, DeprecatedString const& target, unsigned modifiers, Gfx::Bitmap const*) override;
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_main_document() override;
virtual void page_did_create_new_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;