diff --git a/Libraries/LibWeb/Internals/Internals.cpp b/Libraries/LibWeb/Internals/Internals.cpp index 88defe719c7..797ff8bf483 100644 --- a/Libraries/LibWeb/Internals/Internals.cpp +++ b/Libraries/LibWeb/Internals/Internals.cpp @@ -48,9 +48,9 @@ Page& Internals::internals_page() const return internals_window().page(); } -void Internals::signal_text_test_is_done(String const& text) +void Internals::signal_test_is_done(String const& text) { - internals_page().client().page_did_finish_text_test(text); + internals_page().client().page_did_finish_test(text); } void Internals::set_test_timeout(double milliseconds) diff --git a/Libraries/LibWeb/Internals/Internals.h b/Libraries/LibWeb/Internals/Internals.h index 709763e0dff..f7872be8730 100644 --- a/Libraries/LibWeb/Internals/Internals.h +++ b/Libraries/LibWeb/Internals/Internals.h @@ -20,7 +20,7 @@ class Internals final : public Bindings::PlatformObject { public: virtual ~Internals() override; - void signal_text_test_is_done(String const& text); + void signal_test_is_done(String const& text); void set_test_timeout(double milliseconds); void gc(); diff --git a/Libraries/LibWeb/Internals/Internals.idl b/Libraries/LibWeb/Internals/Internals.idl index bdc411ec3bc..27ad7e3c2fe 100644 --- a/Libraries/LibWeb/Internals/Internals.idl +++ b/Libraries/LibWeb/Internals/Internals.idl @@ -5,7 +5,7 @@ [Exposed=Nobody] interface Internals { - undefined signalTextTestIsDone(DOMString text); + undefined signalTestIsDone(DOMString text); undefined setTestTimeout(double milliseconds); undefined gc(); diff --git a/Libraries/LibWeb/Page/Page.h b/Libraries/LibWeb/Page/Page.h index 8be7d715384..ef834ada7c7 100644 --- a/Libraries/LibWeb/Page/Page.h +++ b/Libraries/LibWeb/Page/Page.h @@ -385,7 +385,7 @@ public: virtual void page_did_request_file_picker([[maybe_unused]] HTML::FileFilter const& accepted_file_types, Web::HTML::AllowMultipleFiles) { } virtual void page_did_request_select_dropdown([[maybe_unused]] Web::CSSPixelPoint content_position, [[maybe_unused]] Web::CSSPixels minimum_width, [[maybe_unused]] Vector items) { } - virtual void page_did_finish_text_test([[maybe_unused]] String const& text) { } + virtual void page_did_finish_test([[maybe_unused]] String const& text) { } virtual void page_did_set_test_timeout([[maybe_unused]] double milliseconds) { } virtual void page_did_set_browser_zoom([[maybe_unused]] double factor) { } diff --git a/Libraries/LibWebView/ViewImplementation.h b/Libraries/LibWebView/ViewImplementation.h index c282e4806cf..0fcfbebd140 100644 --- a/Libraries/LibWebView/ViewImplementation.h +++ b/Libraries/LibWebView/ViewImplementation.h @@ -235,7 +235,7 @@ public: Function items)> on_request_select_dropdown; Function on_finish_handling_key_event; Function on_finish_handling_drag_event; - Function on_text_test_finish; + Function on_test_finish; Function on_set_test_timeout; Function on_set_browser_zoom; Function const& total_match_count)> on_find_in_page; diff --git a/Libraries/LibWebView/WebContentClient.cpp b/Libraries/LibWebView/WebContentClient.cpp index d1fc80efa75..6d742706f48 100644 --- a/Libraries/LibWebView/WebContentClient.cpp +++ b/Libraries/LibWebView/WebContentClient.cpp @@ -103,11 +103,11 @@ void WebContentClient::did_finish_loading(u64 page_id, URL::URL url) } } -void WebContentClient::did_finish_text_test(u64 page_id, String text) +void WebContentClient::did_finish_test(u64 page_id, String text) { if (auto view = view_for_page_id(page_id); view.has_value()) { - if (view->on_text_test_finish) - view->on_text_test_finish(text); + if (view->on_test_finish) + view->on_test_finish(text); } } diff --git a/Libraries/LibWebView/WebContentClient.h b/Libraries/LibWebView/WebContentClient.h index 8cc8cfef325..b2dde34bf44 100644 --- a/Libraries/LibWebView/WebContentClient.h +++ b/Libraries/LibWebView/WebContentClient.h @@ -119,7 +119,7 @@ private: virtual void did_request_file_picker(u64 page_id, Web::HTML::FileFilter accepted_file_types, Web::HTML::AllowMultipleFiles) override; virtual void did_request_select_dropdown(u64 page_id, Gfx::IntPoint content_position, i32 minimum_width, Vector items) override; virtual void did_finish_handling_input_event(u64 page_id, Web::EventResult event_result) override; - virtual void did_finish_text_test(u64 page_id, String text) override; + virtual void did_finish_test(u64 page_id, String text) override; virtual void did_set_test_timeout(u64 page_id, double milliseconds) override; virtual void did_set_browser_zoom(u64 page_id, double factor) override; virtual void did_find_in_page(u64 page_id, size_t current_match_index, Optional total_match_count) override; diff --git a/Services/WebContent/PageClient.cpp b/Services/WebContent/PageClient.cpp index 60b095c71bb..ed3f59b7bfd 100644 --- a/Services/WebContent/PageClient.cpp +++ b/Services/WebContent/PageClient.cpp @@ -386,9 +386,9 @@ void PageClient::page_did_finish_loading(URL::URL const& url) client().async_did_finish_loading(m_id, url); } -void PageClient::page_did_finish_text_test(String const& text) +void PageClient::page_did_finish_test(String const& text) { - client().async_did_finish_text_test(m_id, text); + client().async_did_finish_test(m_id, text); } void PageClient::page_did_set_test_timeout(double milliseconds) diff --git a/Services/WebContent/PageClient.h b/Services/WebContent/PageClient.h index 88a49d40b2c..666feaa300c 100644 --- a/Services/WebContent/PageClient.h +++ b/Services/WebContent/PageClient.h @@ -165,7 +165,7 @@ private: virtual void page_did_request_color_picker(Color current_color) override; virtual void page_did_request_file_picker(Web::HTML::FileFilter const& accepted_file_types, Web::HTML::AllowMultipleFiles) override; virtual void page_did_request_select_dropdown(Web::CSSPixelPoint content_position, Web::CSSPixels minimum_width, Vector items) override; - virtual void page_did_finish_text_test(String const& text) override; + virtual void page_did_finish_test(String const& text) override; virtual void page_did_set_test_timeout(double milliseconds) override; virtual void page_did_set_browser_zoom(double factor) override; virtual void page_did_change_theme_color(Gfx::Color color) override; diff --git a/Services/WebContent/WebContentClient.ipc b/Services/WebContent/WebContentClient.ipc index fdbe8317a9c..732b3839d4f 100644 --- a/Services/WebContent/WebContentClient.ipc +++ b/Services/WebContent/WebContentClient.ipc @@ -100,7 +100,7 @@ endpoint WebContentClient did_get_styled_js_console_messages(u64 page_id, i32 start_index, Vector message_types, Vector messages) =| did_get_unstyled_js_console_messages(u64 page_id, i32 start_index, Vector console_output) =| - did_finish_text_test(u64 page_id, String text) =| + did_finish_test(u64 page_id, String text) =| did_set_test_timeout(u64 page_id, double milliseconds) =| did_set_browser_zoom(u64 page_id, double factor) =| diff --git a/Tests/LibWeb/Text/input/HTML/document-write-flush-character-insertions.html b/Tests/LibWeb/Text/input/HTML/document-write-flush-character-insertions.html index 83241a7a2a2..974279af3c8 100644 --- a/Tests/LibWeb/Text/input/HTML/document-write-flush-character-insertions.html +++ b/Tests/LibWeb/Text/input/HTML/document-write-flush-character-insertions.html @@ -2,5 +2,5 @@ diff --git a/Tests/LibWeb/Text/input/IntersectionObserver/img-lazy-loading-not-blocked-by-img-outside-viewport.html b/Tests/LibWeb/Text/input/IntersectionObserver/img-lazy-loading-not-blocked-by-img-outside-viewport.html index 1dd23a541c6..7bbfd17f0f0 100644 --- a/Tests/LibWeb/Text/input/IntersectionObserver/img-lazy-loading-not-blocked-by-img-outside-viewport.html +++ b/Tests/LibWeb/Text/input/IntersectionObserver/img-lazy-loading-not-blocked-by-img-outside-viewport.html @@ -14,6 +14,6 @@ img { const inViewport = document.getElementById("inViewport"); inViewport.addEventListener("load", function() { document.body.innerHTML = "PASS"; - internals.signalTextTestIsDone(document.body.innerText); + internals.signalTestIsDone(document.body.innerText); }); diff --git a/Tests/LibWeb/Text/input/hit_testing/hit-testing-an-xml-svg-should-not-crash.svg b/Tests/LibWeb/Text/input/hit_testing/hit-testing-an-xml-svg-should-not-crash.svg index 48fdc0527d3..0cebed15f17 100644 --- a/Tests/LibWeb/Text/input/hit_testing/hit-testing-an-xml-svg-should-not-crash.svg +++ b/Tests/LibWeb/Text/input/hit_testing/hit-testing-an-xml-svg-should-not-crash.svg @@ -8,7 +8,7 @@ // Note: This test _must_ be in a .svg file! internals.hitTest(400, 400); // Did not crash! - internals.signalTextTestIsDone(""); + internals.signalTestIsDone(""); }); diff --git a/Tests/LibWeb/Text/input/include.js b/Tests/LibWeb/Text/input/include.js index d50a932ed67..7c81f80506a 100644 --- a/Tests/LibWeb/Text/input/include.js +++ b/Tests/LibWeb/Text/input/include.js @@ -10,7 +10,7 @@ function __preventMultipleTestFunctions() { if (globalThis.internals === undefined) { internals = { - signalTextTestIsDone: function () {}, + signalTestIsDone: function () {}, spoofCurrentURL: function (url) {}, }; } @@ -19,7 +19,7 @@ function __finishTest() { if (__originalURL) { internals.spoofCurrentURL(__originalURL); } - internals.signalTextTestIsDone(__outputElement.innerText); + internals.signalTestIsDone(__outputElement.innerText); } function spoofCurrentURL(url) { diff --git a/Tests/LibWeb/Text/input/module-script-in-head.html b/Tests/LibWeb/Text/input/module-script-in-head.html index ccffb8558dd..ca4e17ba917 100644 --- a/Tests/LibWeb/Text/input/module-script-in-head.html +++ b/Tests/LibWeb/Text/input/module-script-in-head.html @@ -5,6 +5,6 @@ __outputElement.setAttribute("id", "out"); __outputElement.appendChild(document.createTextNode("passed\n")) document.body.appendChild(__outputElement); - internals.signalTextTestIsDone(document.body.innerText); + internals.signalTestIsDone(document.body.innerText); diff --git a/Tests/LibWeb/Text/input/wpt-import/css/selectors/has-sibling-chrome-crash.html b/Tests/LibWeb/Text/input/wpt-import/css/selectors/has-sibling-chrome-crash.html index c698b26f266..1ea6481a3a1 100644 --- a/Tests/LibWeb/Text/input/wpt-import/css/selectors/has-sibling-chrome-crash.html +++ b/Tests/LibWeb/Text/input/wpt-import/css/selectors/has-sibling-chrome-crash.html @@ -10,5 +10,5 @@

PASS if this tests does not crash

diff --git a/Tests/LibWeb/Text/input/wpt-import/css/selectors/invalidation/nth-of-namespace-class-invalidation-crash.html b/Tests/LibWeb/Text/input/wpt-import/css/selectors/invalidation/nth-of-namespace-class-invalidation-crash.html index 02381260bb2..36ebe907bcf 100644 --- a/Tests/LibWeb/Text/input/wpt-import/css/selectors/invalidation/nth-of-namespace-class-invalidation-crash.html +++ b/Tests/LibWeb/Text/input/wpt-import/css/selectors/invalidation/nth-of-namespace-class-invalidation-crash.html @@ -12,6 +12,6 @@ document.addEventListener("DOMContentLoaded", () => { b.offsetTop; b.setAttributeNS("h", "class", "") if (window.internals) - window.internals.signalTextTestIsDone("PASS"); + window.internals.signalTestIsDone("PASS"); }) diff --git a/Tests/LibWeb/Text/input/wpt-import/html/dom/elements/the-innertext-and-outertext-properties/innertext-domnoderemoved-crash.html b/Tests/LibWeb/Text/input/wpt-import/html/dom/elements/the-innertext-and-outertext-properties/innertext-domnoderemoved-crash.html index 0aef8580227..fea0cb6a4e6 100644 --- a/Tests/LibWeb/Text/input/wpt-import/html/dom/elements/the-innertext-and-outertext-properties/innertext-domnoderemoved-crash.html +++ b/Tests/LibWeb/Text/input/wpt-import/html/dom/elements/the-innertext-and-outertext-properties/innertext-domnoderemoved-crash.html @@ -15,5 +15,5 @@ parentelement.innerText = 'hello world'; if (window.internals) - internals.signalTextTestIsDone("PASS"); + internals.signalTestIsDone("PASS"); diff --git a/Tests/LibWeb/Text/input/wpt-import/resources/testharnessreport.js b/Tests/LibWeb/Text/input/wpt-import/resources/testharnessreport.js index 7ab6ea74d65..da5309ba8fb 100644 --- a/Tests/LibWeb/Text/input/wpt-import/resources/testharnessreport.js +++ b/Tests/LibWeb/Text/input/wpt-import/resources/testharnessreport.js @@ -53,7 +53,7 @@ add_completion_callback(function(tests, harness_status) { for (const test of tests) { outputLines.push(`${test.format_status()}\t${test.name}`); } - window.internals.signalTextTestIsDone(outputLines.join('\n')); + window.internals.signalTestIsDone(outputLines.join('\n')); } }); diff --git a/UI/Headless/Test.cpp b/UI/Headless/Test.cpp index 0b43bde7585..347f2fdc0f2 100644 --- a/UI/Headless/Test.cpp +++ b/UI/Headless/Test.cpp @@ -130,7 +130,7 @@ static ErrorOr collect_crash_tests(Application const& app, Vector& t static void clear_test_callbacks(HeadlessWebView& view) { view.on_load_finish = {}; - view.on_text_test_finish = {}; + view.on_test_finish = {}; view.on_web_content_crashed = {}; } @@ -138,7 +138,7 @@ void run_dump_test(HeadlessWebView& view, Test& test, URL::URL const& url, int t { auto timer = Core::Timer::create_single_shot(timeout_in_milliseconds, [&view, &test]() { view.on_load_finish = {}; - view.on_text_test_finish = {}; + view.on_test_finish = {}; view.on_set_test_timeout = {}; view.reset_zoom(); @@ -255,7 +255,7 @@ void run_dump_test(HeadlessWebView& view, Test& test, URL::URL const& url, int t } }; - view.on_text_test_finish = [&test, on_test_complete](auto const& text) { + view.on_test_finish = [&test, on_test_complete](auto const& text) { test.text = text; test.did_finish_test = true; @@ -290,7 +290,7 @@ static void run_ref_test(HeadlessWebView& view, Test& test, URL::URL const& url, { auto timer = Core::Timer::create_single_shot(timeout_in_milliseconds, [&view, &test]() { view.on_load_finish = {}; - view.on_text_test_finish = {}; + view.on_test_finish = {}; view.on_set_test_timeout = {}; view.reset_zoom(); @@ -364,7 +364,7 @@ static void run_ref_test(HeadlessWebView& view, Test& test, URL::URL const& url, } }; - view.on_text_test_finish = [&](auto const&) { + view.on_test_finish = [&](auto const&) { dbgln("Unexpected text test finished during ref test for {}", url); }; @@ -398,7 +398,7 @@ static void run_test(HeadlessWebView& view, Test& test, Application& app) }); }; - view.on_text_test_finish = {}; + view.on_test_finish = {}; promise->when_resolved([&view, &test, &app](auto) { auto url = URL::create_with_file_scheme(MUST(FileSystem::real_path(test.input_path)));