LibWeb: Remove always true "should report session history updates"

shannonbooth · kalenikaliaksandr · commit 36456bc5359a · 2026-07-17T03:16:09.000+02:00
While this was all added together, as far as I can tell this always
resolves to true for every test harness we use.
diff --git a/Libraries/LibWeb/HTML/History.cpp b/Libraries/LibWeb/HTML/History.cpp
@@ -269,10 +269,8 @@ WebIDL::ExceptionOr<void> History::set_scroll_restoration(Bindings::ScrollRestor
         break;
     }
 
-    if (this_relevant_global_object.associated_document().page().client().should_report_session_history_updates()) {
-        auto navigable = this_relevant_global_object.navigable();
-        this_relevant_global_object.associated_document().page().client().page_did_update_session_history_entry_scroll_restoration_mode(navigable->id(), active_session_history_entry->navigation_api_key(), active_session_history_entry->scroll_restoration_mode());
-    }
+    auto navigable = this_relevant_global_object.navigable();
+    this_relevant_global_object.associated_document().page().client().page_did_update_session_history_entry_scroll_restoration_mode(navigable->id(), active_session_history_entry->navigation_api_key(), active_session_history_entry->scroll_restoration_mode());
 
     return {};
 }
diff --git a/Libraries/LibWeb/HTML/LocalNavigable.cpp b/Libraries/LibWeb/HTML/LocalNavigable.cpp
@@ -3202,10 +3202,8 @@ void LocalNavigable::reload(Optional<StorageSerializationRecord> navigation_api_
 
     // AD-HOC: Report the reload-pending document state to the UI process before the reload history step finishes,
     //         so the UI-owned session history mirror remains synchronized during an in-flight reload.
-    if (traversable->page().client().should_report_session_history_updates()) {
-        auto session_history_snapshot = traversable->create_session_history_snapshot();
-        traversable->page().client().page_did_update_session_history(session_history_snapshot.top_level_session_history_entries, session_history_snapshot.used_session_history_steps, session_history_snapshot.current_used_step_index);
-    }
+    auto session_history_snapshot = traversable->create_session_history_snapshot();
+    traversable->page().client().page_did_update_session_history(session_history_snapshot.top_level_session_history_entries, session_history_snapshot.used_session_history_steps, session_history_snapshot.current_used_step_index);
 
     // 4. Append the following session history traversal steps to traversable:
     traversable->append_session_history_traversal_steps(GC::create_function(heap(), [traversable, user_involvement](NonnullRefPtr<Core::Promise<Empty>> signal) {
diff --git a/Libraries/LibWeb/HTML/LocalTraversableNavigable.cpp b/Libraries/LibWeb/HTML/LocalTraversableNavigable.cpp
@@ -504,10 +504,8 @@ void LocalTraversableNavigable::reset_session_history_for_testing(GC::Ref<GC::Fu
         auto entries_for_navigation_api = get_session_history_entries_for_the_navigation_api(*this, m_current_session_history_step);
         active_window()->navigation()->initialize_the_navigation_api_entries_for_reconstructed_session_history(entries_for_navigation_api, active_entry);
 
-        if (page().client().should_report_session_history_updates()) {
-            auto session_history_snapshot = create_session_history_snapshot();
-            page().client().page_did_update_session_history(session_history_snapshot.top_level_session_history_entries, session_history_snapshot.used_session_history_steps, session_history_snapshot.current_used_step_index);
-        }
+        auto session_history_snapshot = create_session_history_snapshot();
+        page().client().page_did_update_session_history(session_history_snapshot.top_level_session_history_entries, session_history_snapshot.used_session_history_steps, session_history_snapshot.current_used_step_index);
 
         signal->resolve({});
         on_complete->function()();
@@ -1548,21 +1546,19 @@ void ApplyHistoryStepState::complete()
         m_traversable->m_current_session_history_step = used_target_step;
 
         // AD-HOC: Report the updated session history descriptors to the UI-process mirror.
-        if (m_traversable->page().client().should_report_session_history_updates()) {
-            auto save_active_entry_persisted_state = LocalTraversableNavigable::SaveActiveEntryPersistedState::Yes;
-            // NB: During history traversal, the active entry can point at the target
-            //     entry before the active document's queued history-step update has
-            //     restored the target entry's persisted state. Do not overwrite that
-            //     target entry with the document's pre-restoration viewport offset.
-            if (m_navigation_type == Bindings::NavigationType::Traverse) {
-                auto document = m_traversable->active_document();
-                auto active_entry = m_traversable->active_session_history_entry();
-                if (document && active_entry && document->latest_entry() != active_entry)
-                    save_active_entry_persisted_state = LocalTraversableNavigable::SaveActiveEntryPersistedState::No;
-            }
-            auto session_history_snapshot = m_traversable->create_session_history_snapshot(save_active_entry_persisted_state);
-            m_traversable->page().client().page_did_update_session_history(session_history_snapshot.top_level_session_history_entries, session_history_snapshot.used_session_history_steps, session_history_snapshot.current_used_step_index);
+        auto save_active_entry_persisted_state = LocalTraversableNavigable::SaveActiveEntryPersistedState::Yes;
+        // NB: During history traversal, the active entry can point at the target
+        //     entry before the active document's queued history-step update has
+        //     restored the target entry's persisted state. Do not overwrite that
+        //     target entry with the document's pre-restoration viewport offset.
+        if (m_navigation_type == Bindings::NavigationType::Traverse) {
+            auto document = m_traversable->active_document();
+            auto active_entry = m_traversable->active_session_history_entry();
+            if (document && active_entry && document->latest_entry() != active_entry)
+                save_active_entry_persisted_state = LocalTraversableNavigable::SaveActiveEntryPersistedState::No;
         }
+        auto session_history_snapshot = m_traversable->create_session_history_snapshot(save_active_entry_persisted_state);
+        m_traversable->page().client().page_did_update_session_history(session_history_snapshot.top_level_session_history_entries, session_history_snapshot.used_session_history_steps, session_history_snapshot.current_used_step_index);
 
         VERIFY(m_traversable->m_session_history_entries.size() > 0);
         m_traversable->page().client().page_did_change_url(m_traversable->current_session_history_entry()->url());
@@ -2333,10 +2329,8 @@ void LocalTraversableNavigable::apply_the_reload_history_step(UserNavigationInvo
                 if (auto current_entry = current_session_history_entry(); current_entry && current_entry->document_state()->reload_pending()) {
                     current_entry->document_state()->set_reload_pending(false);
 
-                    if (page().client().should_report_session_history_updates()) {
-                        auto session_history_snapshot = create_session_history_snapshot();
-                        page().client().page_did_update_session_history(session_history_snapshot.top_level_session_history_entries, session_history_snapshot.used_session_history_steps, session_history_snapshot.current_used_step_index);
-                    }
+                    auto session_history_snapshot = create_session_history_snapshot();
+                    page().client().page_did_update_session_history(session_history_snapshot.top_level_session_history_entries, session_history_snapshot.used_session_history_steps, session_history_snapshot.current_used_step_index);
                 }
             }
             on_complete->function()(result);
@@ -2451,10 +2445,8 @@ bool LocalTraversableNavigable::try_to_synchronously_commit_same_document_naviga
         }
     }
 
-    if (page().client().should_report_session_history_updates()) {
-        auto session_history_snapshot = create_session_history_snapshot(SaveActiveEntryPersistedState::Yes);
-        page().client().page_did_update_session_history(session_history_snapshot.top_level_session_history_entries, session_history_snapshot.used_session_history_steps, session_history_snapshot.current_used_step_index);
-    }
+    auto session_history_snapshot = create_session_history_snapshot(SaveActiveEntryPersistedState::Yes);
+    page().client().page_did_update_session_history(session_history_snapshot.top_level_session_history_entries, session_history_snapshot.used_session_history_steps, session_history_snapshot.current_used_step_index);
 
     VERIFY(session_history_entries().size() > 0);
     page().client().page_did_change_url(current_session_history_entry()->url());
diff --git a/Libraries/LibWeb/HTML/Navigation.cpp b/Libraries/LibWeb/HTML/Navigation.cpp
@@ -45,9 +45,6 @@ static void report_navigation_api_state_update(DOM::Document& document, SessionH
         return;
 
     auto traversable = navigable->traversable_navigable();
-    if (!traversable->page().client().should_report_session_history_updates())
-        return;
-
     traversable->page().client().page_did_update_session_history_entry_navigation_api_state(navigable->id(), entry.navigation_api_key(), entry.navigation_api_state());
 }
 
diff --git a/Libraries/LibWeb/Internals/Internals.cpp b/Libraries/LibWeb/Internals/Internals.cpp
@@ -805,8 +805,7 @@ Utf16String Internals::dump_ui_process_session_history()
 {
     auto& document = window().associated_document();
     if (auto navigable = document.navigable()) {
-        if (auto traversable = navigable->traversable_navigable();
-            traversable && document.page().client().should_report_session_history_updates()) {
+        if (auto traversable = navigable->traversable_navigable(); traversable) {
             auto session_history_snapshot = traversable->create_session_history_snapshot();
             return dump_string_to_utf16(document.page().client().page_did_update_session_history_and_request_ui_process_session_history_for_testing(
                 session_history_snapshot.top_level_session_history_entries,
diff --git a/Libraries/LibWeb/Page/Page.h b/Libraries/LibWeb/Page/Page.h
@@ -582,7 +582,6 @@ class PageClient : public JS::Cell {
     virtual NewWebViewResult page_did_request_new_web_view(HTML::ActivateTab, HTML::WebViewHints, HTML::TokenizedFeature::NoOpener) { return {}; }
     virtual void page_did_request_activate_tab() { }
     virtual void page_did_close_top_level_traversable() { }
-    virtual bool should_report_session_history_updates() const { return true; }
     virtual void page_did_update_session_history([[maybe_unused]] Vector<HTML::SessionHistoryEntryDescriptor> const& entries, [[maybe_unused]] Vector<i32> const& used_steps, [[maybe_unused]] size_t current_used_step_index) { }
     virtual void page_did_update_session_history_entry_navigation_api_state([[maybe_unused]] HTML::CrossProcessId navigable_id, [[maybe_unused]] Utf16String const& navigation_api_key, [[maybe_unused]] HTML::StorageSerializationRecord const& navigation_api_state) { }
     virtual void page_did_update_session_history_entry_scroll_restoration_mode([[maybe_unused]] HTML::CrossProcessId navigable_id, [[maybe_unused]] Utf16String const& navigation_api_key, [[maybe_unused]] HTML::ScrollRestorationMode scroll_restoration_mode) { }
diff --git a/Libraries/LibWebView/HelperProcess.cpp b/Libraries/LibWebView/HelperProcess.cpp
@@ -123,8 +123,6 @@ ErrorOr<NonnullRefPtr<WebView::WebContentClient>> launch_web_content_process(IsP
         arguments.append("--disable-async-scrolling"sv);
     if (web_content_options.file_scheme_urls_have_tuple_origins == FileSchemeUrlsHaveTupleOrigins::Yes)
         arguments.append("--tuple-file-origins"sv);
-    if (web_content_options.report_session_history_updates_in_test_mode == ReportSessionHistoryUpdatesInTestMode::Yes)
-        arguments.append("--report-session-history-updates-in-test-mode"sv);
     if (browser_options.disable_sandbox == DisableSandbox::Yes)
         arguments.append("--disable-sandbox"sv);
 
diff --git a/Libraries/LibWebView/Options.h b/Libraries/LibWebView/Options.h
@@ -170,11 +170,6 @@ enum class FileSchemeUrlsHaveTupleOrigins {
     Yes,
 };
 
-enum class ReportSessionHistoryUpdatesInTestMode {
-    No,
-    Yes,
-};
-
 struct WebContentOptions {
     Optional<ByteString> config_path {};
     Optional<ByteString> cache_path {};
@@ -194,7 +189,6 @@ struct WebContentOptions {
     PaintViewportScrollbars paint_viewport_scrollbars { PaintViewportScrollbars::Yes };
     EnableAsyncScrolling enable_async_scrolling { EnableAsyncScrolling::Yes };
     FileSchemeUrlsHaveTupleOrigins file_scheme_urls_have_tuple_origins { FileSchemeUrlsHaveTupleOrigins::No };
-    ReportSessionHistoryUpdatesInTestMode report_session_history_updates_in_test_mode { ReportSessionHistoryUpdatesInTestMode::No };
     Optional<StringView> default_time_zone {};
     Optional<u64> style_invalidation_counter_dump_interval {};
 };
diff --git a/Services/WebContent/PageClient.cpp b/Services/WebContent/PageClient.cpp
@@ -64,7 +64,6 @@ namespace WebContent {
 
 static bool s_is_headless { false };
 static bool s_async_scrolling_enabled { false };
-static bool s_should_report_session_history_updates_in_test_mode { false };
 static constexpr size_t s_max_download_data_ipc_chunk_size = 16 * MiB;
 
 GC_DEFINE_ALLOCATOR(PageClient);
@@ -94,11 +93,6 @@ void PageClient::set_async_scrolling_enabled(bool enabled)
     s_async_scrolling_enabled = enabled;
 }
 
-void PageClient::set_should_report_session_history_updates_in_test_mode(bool should_report)
-{
-    s_should_report_session_history_updates_in_test_mode = should_report;
-}
-
 GC::Ref<PageClient> PageClient::create(JS::VM& vm, PageHost& page_host, u64 id, Optional<Web::HTML::CrossProcessId> pending_root_navigable_id)
 {
     return vm.heap().allocate<PageClient>(page_host, id, pending_root_navigable_id);
@@ -1085,11 +1079,6 @@ void PageClient::send_current_needs_beforeunload_check()
     client().async_did_change_needs_beforeunload_check(m_id, page().needs_beforeunload_check());
 }
 
-bool PageClient::should_report_session_history_updates() const
-{
-    return !Web::HTML::Window::in_test_mode() || s_should_report_session_history_updates_in_test_mode;
-}
-
 void PageClient::page_did_update_session_history(Vector<Web::HTML::SessionHistoryEntryDescriptor> const& entries, Vector<i32> const& used_steps, size_t current_used_step_index)
 {
     client().async_did_update_session_history(m_id, entries, used_steps, current_used_step_index);
diff --git a/Services/WebContent/PageClient.h b/Services/WebContent/PageClient.h
@@ -46,7 +46,6 @@ class PageClient final : public Web::PageClient {
     static void set_is_headless(bool);
 
     static void set_async_scrolling_enabled(bool);
-    static void set_should_report_session_history_updates_in_test_mode(bool);
 
     virtual Web::Page& page() override { return *m_page; }
     virtual Web::Page const& page() const override { return *m_page; }
@@ -242,7 +241,6 @@ class PageClient final : public Web::PageClient {
     virtual void page_did_request_activate_tab() override;
     virtual void page_did_close_top_level_traversable() override;
     virtual void page_did_change_needs_beforeunload_check(bool needs_beforeunload_check) override;
-    virtual bool should_report_session_history_updates() const override;
     virtual void page_did_update_session_history(Vector<Web::HTML::SessionHistoryEntryDescriptor> const&, Vector<i32> const& used_steps, size_t current_used_step_index) override;
     virtual void page_did_update_session_history_entry_navigation_api_state(Web::HTML::CrossProcessId navigable_id, Utf16String const& navigation_api_key, Web::HTML::StorageSerializationRecord const& navigation_api_state) override;
     virtual void page_did_update_session_history_entry_scroll_restoration_mode(Web::HTML::CrossProcessId navigable_id, Utf16String const& navigation_api_key, Web::HTML::ScrollRestorationMode scroll_restoration_mode) override;
diff --git a/Services/WebContent/main.cpp b/Services/WebContent/main.cpp
@@ -148,7 +148,6 @@ ErrorOr<int> ladybird_main(Main::Arguments arguments)
     bool disable_scrollbar_painting = false;
     bool disable_async_scrolling = false;
     bool disable_sandbox = false;
-    bool report_session_history_updates_in_test_mode = false;
     StringView echo_server_port_string_view {};
     StringView default_time_zone {};
     StringView style_invalidation_counter_dump_interval {};
@@ -185,7 +184,6 @@ ErrorOr<int> ladybird_main(Main::Arguments arguments)
     args_parser.add_option(disable_scrollbar_painting, "Don't paint horizontal or vertical viewport scrollbars", "disable-scrollbar-painting");
     args_parser.add_option(disable_async_scrolling, "Disable async scrolling", "disable-async-scrolling");
     args_parser.add_option(disable_sandbox, "Disable process sandboxing", "disable-sandbox");
-    args_parser.add_option(report_session_history_updates_in_test_mode, "Report session history updates in test mode", "report-session-history-updates-in-test-mode");
     args_parser.add_option(echo_server_port_string_view, "Echo server port used in test internals", "echo-server-port", 0, "echo_server_port");
     args_parser.add_option(is_headless, "Report that the browser is running in headless mode", "headless");
     args_parser.add_option(default_time_zone, "Default time zone", "default-time-zone", 0, "time-zone-id");
@@ -228,7 +226,6 @@ ErrorOr<int> ladybird_main(Main::Arguments arguments)
 
     Web::Painting::set_paint_viewport_scrollbars(!disable_scrollbar_painting);
     WebContent::PageClient::set_async_scrolling_enabled(!disable_async_scrolling);
-    WebContent::PageClient::set_should_report_session_history_updates_in_test_mode(report_session_history_updates_in_test_mode);
 
     if (!echo_server_port_string_view.is_empty()) {
         if (auto maybe_echo_server_port = echo_server_port_string_view.to_number<u16>(); maybe_echo_server_port.has_value())
diff --git a/Tests/LibWeb/test-web/Application.cpp b/Tests/LibWeb/test-web/Application.cpp
@@ -87,8 +87,6 @@ void Application::create_platform_options(WebView::BrowserOptions& browser_optio
     // Ensure consistent time zone operations across different machine configurations.
     web_content_options.default_time_zone = "UTC"sv;
 
-    web_content_options.report_session_history_updates_in_test_mode = WebView::ReportSessionHistoryUpdatesInTestMode::Yes;
-
     if (dump_gc_graph) {
         // Force all tests to run in serial if we are interested in the GC graph.
         test_concurrency = 1;

Original file line number	Diff line number	Diff line change
`@@ -269,10 +269,8 @@ WebIDL::ExceptionOr<void> History::set_scroll_restoration(Bindings::ScrollRestor`
`269`	`269`	`break;`
`270`	`270`	`}`
`271`	`271`
`272`		`- if (this_relevant_global_object.associated_document().page().client().should_report_session_history_updates()) {`
`273`		`- auto navigable = this_relevant_global_object.navigable();`
`274`		`- this_relevant_global_object.associated_document().page().client().page_did_update_session_history_entry_scroll_restoration_mode(navigable->id(), active_session_history_entry->navigation_api_key(), active_session_history_entry->scroll_restoration_mode());`
`275`		`- }`
	`272`	`+ auto navigable = this_relevant_global_object.navigable();`
	`273`	`+ this_relevant_global_object.associated_document().page().client().page_did_update_session_history_entry_scroll_restoration_mode(navigable->id(), active_session_history_entry->navigation_api_key(), active_session_history_entry->scroll_restoration_mode());`
`276`	`274`
`277`	`275`	`return {};`
`278`	`276`	`}`
Original file line number	Diff line number	Diff line change
`@@ -45,9 +45,6 @@ static void report_navigation_api_state_update(DOM::Document& document, SessionH`
`45`	`45`	`return;`
`46`	`46`
`47`	`47`	`auto traversable = navigable->traversable_navigable();`
`48`		`- if (!traversable->page().client().should_report_session_history_updates())`
`49`		`- return;`
`50`		`-`
`51`	`48`	`traversable->page().client().page_did_update_session_history_entry_navigation_api_state(navigable->id(), entry.navigation_api_key(), entry.navigation_api_state());`
`52`	`49`	`}`
`53`	`50`