From 216ccaf80593912819182f2d7e7c47e9b6b6ae2b Mon Sep 17 00:00:00 2001 From: Linus Groh Date: Thu, 8 Oct 2020 21:04:32 +0100 Subject: [PATCH] LibWeb: Handle PageClient::page_did_change_title() in Frame::set_document() --- Libraries/LibWeb/Loader/FrameLoader.cpp | 3 --- Libraries/LibWeb/Page/Frame.cpp | 4 +++- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Libraries/LibWeb/Loader/FrameLoader.cpp b/Libraries/LibWeb/Loader/FrameLoader.cpp index 79e3eb2baa..f3c66e9011 100644 --- a/Libraries/LibWeb/Loader/FrameLoader.cpp +++ b/Libraries/LibWeb/Loader/FrameLoader.cpp @@ -207,7 +207,6 @@ void FrameLoader::load_html(const StringView& html, const URL& url) HTML::HTMLDocumentParser parser(html, "utf-8"); parser.run(url); frame().set_document(&parser.document()); - frame().page().client().page_did_change_title(document->title()); } void FrameLoader::load_error_page(const URL& failed_url, const String& error) @@ -224,7 +223,6 @@ void FrameLoader::load_error_page(const URL& failed_url, const String& error) auto document = HTML::parse_html_document(html, failed_url, "utf-8"); ASSERT(document); frame().set_document(document); - frame().page().client().page_did_change_title(document->title()); }, [](auto error) { dbg() << "Failed to load error page: " << error; @@ -257,7 +255,6 @@ void FrameLoader::resource_did_load() } frame().set_document(document); - frame().page().client().page_did_change_title(document->title()); if (!url.fragment().is_empty()) frame().scroll_to_anchor(url.fragment()); diff --git a/Libraries/LibWeb/Page/Frame.cpp b/Libraries/LibWeb/Page/Frame.cpp index 66b5d3dd74..cb4bbf4613 100644 --- a/Libraries/LibWeb/Page/Frame.cpp +++ b/Libraries/LibWeb/Page/Frame.cpp @@ -85,8 +85,10 @@ void Frame::set_document(DOM::Document* document) m_document = document; - if (m_document) + if (m_document) { m_document->attach_to_frame({}, *this); + page().client().page_did_change_title(m_document->title()); + } page().client().page_did_set_document_in_main_frame(m_document); }