Cherry-pick 29.75 Ladybird PRs

Base/home/anon/.config/BrowserContentFilters.txt

@@ -406,8 +406,8 @@ glassboxdigital.io
 go-mpulse.net
 go2speed.org
 google-analytics.com
-google.com/gen_204\?
-google.com/log\?
+google.com/gen_204?
+google.com/log?
 googleadservices.com
 googleoptimize.com
 googlesyndication.com

Base/res/ladybird/inspector.js

@@ -614,30 +614,47 @@ document.addEventListener("DOMContentLoaded", () => {
     document.addEventListener("keydown", event => {
         const UP_ARROW_KEYCODE = 38;
         const DOWN_ARROW_KEYCODE = 40;
+        const RIGHT_ARROW_KEYCODE = 39;
+        const LEFT_ARROW_KEYCODE = 37;
         const RETURN_KEYCODE = 13;
         const SPACE_KEYCODE = 32;
 
-        if (document.activeElement.tagName !== "INPUT") {
-            if (event.keyCode == UP_ARROW_KEYCODE || event.keyCode == DOWN_ARROW_KEYCODE) {
-                let selectedIndex = visibleDOMNodes.indexOf(selectedDOMNode);
-                if (selectedIndex < 0) {
-                    return;
-                }
+        const move = delta => {
+            let selectedIndex = visibleDOMNodes.indexOf(selectedDOMNode);
+            if (selectedIndex < 0) {
+                return;
+            }
 
-                let newIndex;
+            let newIndex = selectedIndex + delta;
 
-                if (event.keyCode == UP_ARROW_KEYCODE) {
-                    newIndex = selectedIndex - 1;
-                } else if (event.keyCode == DOWN_ARROW_KEYCODE) {
-                    newIndex = selectedIndex + 1;
-                }
+            if (visibleDOMNodes[newIndex]) {
+                inspectDOMNode(visibleDOMNodes[newIndex]);
+            }
+        };
 
-                if (visibleDOMNodes[newIndex]) {
-                    inspectDOMNode(visibleDOMNodes[newIndex]);
-                }
+        if (document.activeElement.tagName !== "INPUT") {
+            const isSummary = selectedDOMNode.parentNode.tagName === "SUMMARY";
+            const isDiv = selectedDOMNode.parentNode.tagName === "DIV";
+
+            if (event.keyCode == UP_ARROW_KEYCODE) {
+                move(-1);
+            } else if (event.keyCode == DOWN_ARROW_KEYCODE) {
+                move(1);
             } else if (event.keyCode == RETURN_KEYCODE || event.keyCode == SPACE_KEYCODE) {
-                if (selectedDOMNode.parentNode.tagName === "SUMMARY") {
+                if (isSummary) {
+                    selectedDOMNode.parentNode.click();
+                }
+            } else if (event.keyCode == RIGHT_ARROW_KEYCODE) {
+                if (isSummary && selectedDOMNode.parentNode.parentNode.open === false) {
+                    selectedDOMNode.parentNode.click();
+                } else if (selectedDOMNode.parentNode.parentNode.open === true && !isDiv) {
+                    move(1);
+                }
+            } else if (event.keyCode == LEFT_ARROW_KEYCODE) {
+                if (isSummary && selectedDOMNode.parentNode.parentNode.open === true) {
                     selectedDOMNode.parentNode.click();
+                } else if (selectedDOMNode.parentNode.parentNode.open === false || isDiv) {
+                    move(-1);
                 }
             }
         }

Ladybird/Qt/EventLoopImplementationQt.cpp

@@ -209,6 +209,14 @@ void EventLoopImplementationQt::post_event(Core::EventReceiver& receiver, Nonnul
         wake();
 }
 
+void EventLoopImplementationQt::set_main_loop()
+{
+    m_main_loop = true;
+
+    auto& event_loop_manager = static_cast<EventLoopManagerQt&>(Core::EventLoopManager::the());
+    event_loop_manager.set_main_loop_signal_notifiers({});
+}
+
 static void qt_timer_fired(Core::TimerShouldFireWhenNotVisible should_fire_when_not_visible, Core::EventReceiver& object)
 {
     if (should_fire_when_not_visible == Core::TimerShouldFireWhenNotVisible::No) {
@@ -330,6 +338,10 @@ bool EventLoopManagerQt::event_target_received_event(Badge<EventLoopImplementati
 
 EventLoopManagerQt::EventLoopManagerQt()
     : m_main_thread_event_target(make<EventLoopImplementationQtEventTarget>())
+{
+}
+
+void EventLoopManagerQt::set_main_loop_signal_notifiers(Badge<EventLoopImplementationQt>)
 {
     MUST(Core::System::socketpair(AF_LOCAL, SOCK_STREAM, 0, m_signal_socket_fds));
     m_signal_socket_notifier = new QSocketNotifier(m_signal_socket_fds[0], QSocketNotifier::Read);

Ladybird/Qt/EventLoopImplementationQt.h

@@ -18,6 +18,7 @@
 
 namespace Ladybird {
 
+class EventLoopImplementationQt;
 class EventLoopImplementationQtEventTarget;
 
 class EventLoopManagerQt final : public Core::EventLoopManager {
@@ -38,6 +39,8 @@ class EventLoopManagerQt final : public Core::EventLoopManager {
     virtual int register_signal(int, Function<void(int)>) override;
     virtual void unregister_signal(int) override;
 
+    void set_main_loop_signal_notifiers(Badge<EventLoopImplementationQt>);
+
 private:
     static void handle_signal(int);
 
@@ -77,7 +80,7 @@ class EventLoopImplementationQt final : public Core::EventLoopImplementation {
     virtual bool was_exit_requested() const override { return false; }
     virtual void notify_forked_and_in_child() override { }
 
-    void set_main_loop() { m_main_loop = true; }
+    void set_main_loop();
 
 private:
     friend class EventLoopManagerQt;

Ladybird/Qt/Tab.cpp

@@ -588,8 +588,8 @@ Tab::Tab(BrowserWindow* window, WebContentOptions const& web_content_options, St
     });
 
     m_link_context_menu = new QMenu("Link context menu", this);
-    m_link_context_menu->addAction(open_link_action);
     m_link_context_menu->addAction(open_link_in_new_tab_action);
+    m_link_context_menu->addAction(open_link_action);
     m_link_context_menu->addSeparator();
     m_link_context_menu->addAction(m_link_context_menu_copy_url_action);
     m_link_context_menu->addSeparator();

Meta/Lagom/Tools/CodeGenerators/LibWeb/BindingsGenerator/IDLGenerators.cpp

@@ -94,6 +94,7 @@ static bool is_platform_object(Type const& type)
         "TextMetrics"sv,
         "TextTrack"sv,
         "URLSearchParams"sv,
+        "VTTRegion"sv,
         "VideoTrack"sv,
         "VideoTrackList"sv,
         "WebGLRenderingContext"sv,
@@ -4212,6 +4213,7 @@ static void generate_using_namespace_definitions(SourceGenerator& generator)
     using namespace Web::WebAudio;
     using namespace Web::WebGL;
     using namespace Web::WebIDL;
+    using namespace Web::WebVTT;
     using namespace Web::XHR;
 )~~~"sv);
 }

Meta/gn/secondary/Userland/Libraries/LibWeb/BUILD.gn

@@ -343,6 +343,7 @@ shared_library("LibWeb") {
            "WebGL",
            "WebIDL",
            "WebSockets",
+           "WebVTT",
            "Worker",
            "XHR",
            "XLink",

Meta/gn/secondary/Userland/Libraries/LibWeb/HTML/BUILD.gn

@@ -175,6 +175,8 @@ source_set("HTML") {
     "TagNames.cpp",
     "TextMetrics.cpp",
     "TextTrack.cpp",
+    "TextTrackCue.cpp",
+    "TextTrackCueList.cpp",
     "TextTrackList.cpp",
     "TimeRanges.cpp",
     "Timer.cpp",

Meta/gn/secondary/Userland/Libraries/LibWeb/WebVTT/BUILD.gn

@@ -0,0 +1,8 @@
+source_set("WebVTT") {
+  configs += [ "//Userland/Libraries/LibWeb:configs" ]
+  deps = [ "//Userland/Libraries/LibWeb:all_generated" ]
+  sources = [
+    "VTTCue.cpp",
+    "VTTRegion.cpp",
+  ]
+}

Meta/gn/secondary/Userland/Libraries/LibWeb/idl_files.gni

@@ -239,6 +239,8 @@ standard_idl_files = [
   "//Userland/Libraries/LibWeb/HTML/SubmitEvent.idl",
   "//Userland/Libraries/LibWeb/HTML/TextMetrics.idl",
   "//Userland/Libraries/LibWeb/HTML/TextTrack.idl",
+  "//Userland/Libraries/LibWeb/HTML/TextTrackCue.idl",
+  "//Userland/Libraries/LibWeb/HTML/TextTrackCueList.idl",
   "//Userland/Libraries/LibWeb/HTML/TextTrackList.idl",
   "//Userland/Libraries/LibWeb/HTML/TimeRanges.idl",
   "//Userland/Libraries/LibWeb/HTML/ToggleEvent.idl",
@@ -357,6 +359,8 @@ standard_idl_files = [
   "//Userland/Libraries/LibWeb/WebGL/WebGLRenderingContext.idl",
   "//Userland/Libraries/LibWeb/WebIDL/DOMException.idl",
   "//Userland/Libraries/LibWeb/WebSockets/WebSocket.idl",
+  "//Userland/Libraries/LibWeb/WebVTT/VTTCue.idl",
+  "//Userland/Libraries/LibWeb/WebVTT/VTTRegion.idl",
   "//Userland/Libraries/LibWeb/XHR/ProgressEvent.idl",
   "//Userland/Libraries/LibWeb/XHR/XMLHttpRequest.idl",
   "//Userland/Libraries/LibWeb/XHR/XMLHttpRequestEventTarget.idl",

Tests/LibWeb/Layout/expected/css-all-unset.txt

@@ -1,5 +1,5 @@
-Viewport <#document> at (0,0) content-size 800x600 children: inline
-  InlineNode <html>
+Viewport <#document> at (0,0) content-size 800x600 children: not-inline
+  BlockContainer <html> at (0,0) content-size 800x17 [BFC] children: inline
     InlineNode <head>
       InlineNode <style>
         frag 0 from TextNode start: 1, length: 18, rect: [0,0 134.984375x17] baseline: 13.296875
@@ -11,7 +11,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: inline
       TextNode <#text>
 
 ViewportPaintable (Viewport<#document>) [0,0 800x600]
-  InlinePaintable (InlineNode<HTML>)
+  PaintableWithLines (BlockContainer<HTML>) [0,0 800x17]
     InlinePaintable (InlineNode<HEAD>)
       InlinePaintable (InlineNode<STYLE>)
         TextPaintable (TextNode<#text>)

Tests/LibWeb/Layout/expected/html-display-contents.txt

@@ -0,0 +1,11 @@
+Viewport <#document> at (0,0) content-size 800x600 children: not-inline
+  BlockContainer <html> at (0,0) content-size 800x600 [BFC] children: not-inline
+    BlockContainer <body> at (8,8) content-size 784x17 children: inline
+      frag 0 from TextNode start: 0, length: 3, rect: [8,8 18.828125x17] baseline: 13.296875
+          "lol"
+      TextNode <#text>
+
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
+  PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
+    PaintableWithLines (BlockContainer<BODY>) [8,8 784x17]
+      TextPaintable (TextNode<#text>)

Tests/LibWeb/Layout/expected/html-display-inline.txt

@@ -0,0 +1,11 @@
+Viewport <#document> at (0,0) content-size 800x600 children: not-inline
+  BlockContainer <html> at (0,0) content-size 800x600 [BFC] children: not-inline
+    BlockContainer <body> at (8,8) content-size 784x17 children: inline
+      frag 0 from TextNode start: 0, length: 3, rect: [8,8 18.828125x17] baseline: 13.296875
+          "lol"
+      TextNode <#text>
+
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
+  PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
+    PaintableWithLines (BlockContainer<BODY>) [8,8 784x17]
+      TextPaintable (TextNode<#text>)

Tests/LibWeb/Layout/expected/replaced-within-max-content.txt

@@ -7,7 +7,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
         frag 0 from ImageBox start: 0, length: 0, rect: [8,8 150x150] baseline: 150
         ImageBox <img.replaced> at (8,8) content-size 150x150 children: not-inline
           (SVG-as-image isolated context)
-          Viewport <#document> at (0,0) content-size 150x150 [BFC] children: inline
+          Viewport <#document> at (0,0) content-size 150x150 [BFC] children: not-inline
             SVGSVGBox <svg> at (0,0) content-size 150x150 [SVG] children: not-inline
               SVGGeometryBox <path> at (0,0) content-size 150x150 children: not-inline
         TextNode <#text>

Tests/LibWeb/Layout/expected/svg/svg-as-image-implicit-viewbox.txt

@@ -3,7 +3,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
     BlockContainer <body> at (8,8) content-size 784x100 children: not-inline
       ImageBox <img> at (8,8) content-size 50x100 children: not-inline
         (SVG-as-image isolated context)
-        Viewport <#document> at (0,0) content-size 50x100 [BFC] children: inline
+        Viewport <#document> at (0,0) content-size 50x100 [BFC] children: not-inline
           SVGSVGBox <svg> at (0,0) content-size 50x100 [SVG] children: not-inline
             SVGGeometryBox <rect> at (0,0) content-size 50x100 children: not-inline
 

Tests/LibWeb/Layout/expected/svg/svg-as-image.txt

@@ -3,7 +3,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
     BlockContainer <body> at (8,8) content-size 784x1568 children: not-inline
       ImageBox <img> at (8,8) content-size 784x1568 children: not-inline
         (SVG-as-image isolated context)
-        Viewport <#document> at (0,0) content-size 784x1568 [BFC] children: inline
+        Viewport <#document> at (0,0) content-size 784x1568 [BFC] children: not-inline
           SVGSVGBox <svg> at (0,0) content-size 784x1568 [SVG] children: inline
             TextNode <#text>
             SVGGeometryBox <rect> at (0,0) content-size 784x1568 children: not-inline

Tests/LibWeb/Layout/expected/svg/svg-with-zero-intrinsic-size-and-no-viewbox.txt

@@ -1,9 +1,9 @@
-Viewport <#document> at (0,0) content-size 800x600 children: inline
-  InlineNode <svg>
+Viewport <#document> at (0,0) content-size 800x600 children: not-inline
+  BlockContainer <svg> at (0,0) content-size 800x0 children: inline
     TextNode <#text>
     InlineNode <rect>
     TextNode <#text>
 
 ViewportPaintable (Viewport<#document>) [0,0 800x600]
-  InlinePaintable (InlineNode<svg>)
+  PaintableWithLines (BlockContainer<svg>) [0,0 800x0]
     InlinePaintable (InlineNode<rect>)

Tests/LibWeb/Layout/expected/zero-height-viewport-svg-image.txt

@@ -4,7 +4,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
       frag 0 from ImageBox start: 0, length: 0, rect: [8,8 300x150] baseline: 150
       ImageBox <img> at (8,8) content-size 300x150 children: not-inline
         (SVG-as-image isolated context)
-        Viewport <#document> at (0,0) content-size 300x150 [BFC] children: inline
+        Viewport <#document> at (0,0) content-size 300x150 [BFC] children: not-inline
           SVGSVGBox <svg> at (0,0) content-size 300x150 [SVG] children: not-inline
       TextNode <#text>
 

Tests/LibWeb/Layout/expected/zero-width-viewport-svg-image.txt

@@ -4,7 +4,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
       frag 0 from ImageBox start: 0, length: 0, rect: [8,8 300x150] baseline: 150
       ImageBox <img> at (8,8) content-size 300x150 children: not-inline
         (SVG-as-image isolated context)
-        Viewport <#document> at (0,0) content-size 300x150 [BFC] children: inline
+        Viewport <#document> at (0,0) content-size 300x150 [BFC] children: not-inline
           SVGSVGBox <svg> at (0,0) content-size 300x150 [SVG] children: not-inline
 
 ViewportPaintable (Viewport<#document>) [0,0 800x600]

Tests/LibWeb/Layout/input/html-display-contents.html

@@ -0,0 +1 @@
+<html style="display:contents"><body>lol

Tests/LibWeb/Layout/input/html-display-inline.html

@@ -0,0 +1 @@
+<html style="display:inline">lol

Tests/LibWeb/TestMimeSniff.cpp

@@ -6,6 +6,7 @@
  */
 
 #include <LibTest/TestCase.h>
+#include <LibWeb/MimeSniff/MimeType.h>
 
 #include <LibWeb/MimeSniff/Resource.h>
 
@@ -28,10 +29,10 @@ TEST_CASE(determine_computed_mime_type_given_no_sniff_is_set)
 
 TEST_CASE(determine_computed_mime_type_given_no_sniff_is_unset)
 {
-    auto supplied_type = MUST(Web::MimeSniff::MimeType::create("text"_string, "html"_string));
+    auto supplied_type = MUST(Web::MimeSniff::MimeType::create("application"_string, "x-this-is-a-test"_string));
     auto computed_mime_type = MUST(Web::MimeSniff::Resource::sniff("\x00"sv.bytes(), Web::MimeSniff::SniffingConfiguration { .supplied_type = supplied_type }));
 
-    EXPECT_EQ("application/octet-stream"sv, MUST(computed_mime_type.serialized()));
+    EXPECT_EQ("application/x-this-is-a-test"sv, MUST(computed_mime_type.serialized()));
 }
 
 TEST_CASE(determine_computed_mime_type_given_xml_mime_type_as_supplied_type)
@@ -110,6 +111,19 @@ TEST_CASE(determine_computed_mime_type_given_supplied_type_that_is_an_apache_bug
     }
 }
 
+TEST_CASE(determine_computed_mime_type_given_xml_or_html_supplied_type)
+{
+    // With HTML supplied type.
+    auto config = Web::MimeSniff::SniffingConfiguration { .supplied_type = MUST(Web::MimeSniff::MimeType::create("text"_string, "html"_string)) };
+    auto computed_mime_type = MUST(Web::MimeSniff::Resource::sniff(""sv.bytes(), config));
+    EXPECT_EQ("text/html"sv, MUST(computed_mime_type.serialized()));
+
+    // With XML supplied type.
+    config = Web::MimeSniff::SniffingConfiguration { .supplied_type = MUST(Web::MimeSniff::MimeType::create("text"_string, "xml"_string)) };
+    computed_mime_type = MUST(Web::MimeSniff::Resource::sniff(""sv.bytes(), config));
+    EXPECT_EQ("text/xml"sv, MUST(computed_mime_type.serialized()));
+}
+
 TEST_CASE(determine_computed_mime_type_in_both_none_and_browsing_sniffing_context)
 {
     HashMap<StringView, Vector<StringView>> mime_type_to_headers_map;

Tests/LibWeb/Text/expected/DOM/Document-defaultView.txt

@@ -0,0 +1 @@
+document.defaultView === window: true

Tests/LibWeb/Text/expected/DOM/range-bounding-client-rect-with-nested-text.txt

@@ -0,0 +1,2 @@
+  Hello   Ladybird   Ladybird again   World    6
+4

Tests/LibWeb/Text/expected/DOM/range-get-client-rects.txt

@@ -0,0 +1,2 @@
+ x   [object DOMRectList]
+[object DOMRect]

Tests/LibWeb/Text/expected/HTML/Window-onerror.txt

@@ -0,0 +1 @@
+onerror event fired: Error: Uncaught error

Tests/LibWeb/Text/expected/HTML/document-write-flush-character-insertions.txt

@@ -0,0 +1 @@
+PASS

Tests/LibWeb/Text/expected/ShadowDOM/replace-declarative-shadow-root-with-style-sheet.txt

@@ -0,0 +1 @@
+   PASS (didn't crash)

Tests/LibWeb/Text/expected/all-window-properties.txt

@@ -343,6 +343,8 @@ TextDecoder
 TextEncoder
 TextMetrics
 TextTrack
+TextTrackCue
+TextTrackCueList
 TextTrackList
 TimeRanges
 ToggleEvent
@@ -360,6 +362,8 @@ Uint32Array
 Uint8Array
 Uint8ClampedArray
 UserActivation
+VTTCue
+VTTRegion
 ValidityState
 VideoTrack
 VideoTrackList

Tests/LibWeb/Text/expected/css/custom-properties-from-all-layers.txt

@@ -0,0 +1,4 @@
+   1px
+2px
+3px
+4px

Tests/LibWeb/Text/expected/css/revert-ignores-layers.txt

@@ -0,0 +1 @@
+   PASS, revert skipped the layers