Implement focus fixup rule

nt1m · nt1m · commit f67e8bfb8608 · 2022-11-02T18:48:52.000-07:00
https://bugs.webkit.org/show_bug.cgi?id=237273 rdar://89902824 Reviewed by NOBODY (OOPS!). It's currently specced at whatwg/html#8392 as a rendering step after requestAnimationFrame callbacks. * LayoutTests/imported/w3c/web-platform-tests/inert/dynamic-inert-on-focused-element-expected.txt: * Source/WebCore/page/Page.cpp: (WebCore::Page::updateRendering): (WebCore::operator<<): * Source/WebCore/page/Page.h:
diff --git a/LayoutTests/imported/w3c/web-platform-tests/inert/dynamic-inert-on-focused-element-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/inert/dynamic-inert-on-focused-element-expected.txt
@@ -1,22 +1,10 @@
 
-FAIL <input> that gets 'inert' attribute assert_equals: The element stops being focused expected Element node <body><div id="log"></div>
-
-<div class="test-wrapper" dat... but got Element node <input class="becomes-inert check-focus" inert=""></input>
-FAIL <input> whose parent gets 'inert' attribute assert_equals: The element stops being focused expected Element node <body><div id="log"></div>
-
-<div class="test-wrapper" dat... but got Element node <input class="check-focus"></input>
-FAIL <button> that gets 'inert' attribute assert_equals: The element stops being focused expected Element node <body><div id="log"></div>
-
-<div class="test-wrapper" dat... but got Element node <button class="becomes-inert check-focus" inert="">foo</b...
-FAIL <div> that gets 'inert' attribute assert_equals: The element stops being focused expected Element node <body><div id="log"></div>
-
-<div class="test-wrapper" dat... but got Element node <div class="becomes-inert check-focus" tabindex="-1" iner...
-FAIL <div> whose parent gets 'inert' attribute assert_equals: The element stops being focused expected Element node <body><div id="log"></div>
-
-<div class="test-wrapper" dat... but got Element node <div class="check-focus" tabindex="-1">bar</div>
-FAIL <div> whose grandparent gets 'inert' attribute assert_equals: The element stops being focused expected Element node <body><div id="log"></div>
-
-<div class="test-wrapper" dat... but got Element node <span class="check-focus" tabindex="-1">baz</span>
+PASS <input> that gets 'inert' attribute
+PASS <input> whose parent gets 'inert' attribute
+PASS <button> that gets 'inert' attribute
+PASS <div> that gets 'inert' attribute
+PASS <div> whose parent gets 'inert' attribute
+PASS <div> whose grandparent gets 'inert' attribute
 
 
 foo
diff --git a/Source/WebCore/page/Page.cpp b/Source/WebCore/page/Page.cpp
@@ -59,6 +59,7 @@
 #include "Editing.h"
 #include "Editor.h"
 #include "EditorClient.h"
+#include "ElementRareData.h"
 #include "EmptyClients.h"
 #include "Event.h"
 #include "EventHandler.h"
@@ -138,6 +139,7 @@
 #include "ScrollingCoordinator.h"
 #include "ServiceWorkerGlobalScope.h"
 #include "Settings.h"
+#include "ShadowRoot.h"
 #include "SharedBuffer.h"
 #include "SocketProvider.h"
 #include "SpeechRecognitionProvider.h"
@@ -1730,6 +1732,15 @@ void Page::updateRendering()
         document.serviceRequestAnimationFrameCallbacks();
     });
 
+    runProcessingStep(RenderingUpdateStep::FocusFixupRule, [] (Document& document) {
+        if (auto* activeElement = document.activeElement()) {
+            if (auto* root = activeElement->shadowRoot(); root && root->activeElement())
+                activeElement = root->activeElement();
+            if (!activeElement->isFocusable())
+                document.setFocusedElement(nullptr);
+        }
+    });
+
     layoutIfNeeded();
 
     runProcessingStep(RenderingUpdateStep::ResizeObservations, [&] (Document& document) {
@@ -3930,6 +3941,7 @@ WTF::TextStream& operator<<(WTF::TextStream& ts, RenderingUpdateStep step)
 #endif
     case RenderingUpdateStep::VideoFrameCallbacks: ts << "VideoFrameCallbacks"; break;
     case RenderingUpdateStep::PrepareCanvasesForDisplay: ts << "PrepareCanvasesForDisplay"; break;
+    case RenderingUpdateStep::FocusFixupRule: ts << "FocusFixupRule"; break;
     }
     return ts;
 }
diff --git a/Source/WebCore/page/Page.h b/Source/WebCore/page/Page.h
@@ -233,6 +233,7 @@ enum class RenderingUpdateStep : uint32_t {
     FlushAutofocusCandidates        = 1 << 14,
     VideoFrameCallbacks             = 1 << 15,
     PrepareCanvasesForDisplay       = 1 << 16,
+    FocusFixupRule                  = 1 << 17,
 };
 
 constexpr OptionSet<RenderingUpdateStep> updateRenderingSteps = {
