Changeset 287563 in webkit

Timestamp:

Jan 4, 2022 5:29:08 AM (7 months ago)

Author:

Manuel Rego Casasnovas

Message:

[selectors] :focus-visible not matching on accessKey focus after focusing something via mouse
​https://bugs.webkit.org/show_bug.cgi?id=234077
<rdar://problem/86572561>

Reviewed by Antti Koivisto.

Source/WebCore:

This patch adds Element::focusForBindings() to differentitate when this is called from JavaScript.
If that's the case it pass a new FocusTrigger::Bindings value to Element::focus(),
so we can differentiate when this was called from some internal code or from JavaScript.

When Element::focus() has been called internally, we always want to show the focus ring
(thus pass FocusVisibility::Visible). However when it's called from a script
we'll set it to Visible or Invisible depending on if the previously focused element
was focused via mouse click or not (this is needed to pass
the css/selectors/focus-visible-script-focus-* tests from WPT repository).

Test: fast/selectors/focus-visible-accesskey.html

• dom/Element.cpp:

(WebCore::Element::focus):
(WebCore::Element::focusForBindings):

• dom/Element.h:

(WebCore::Element::focusForBindings):

• dom/FocusOptions.h:
• html/HTMLOrForeignElement.idl:

LayoutTests:

Writing an internal test as WPT tests for this don't work due to webkit.org/b/234139.

• fast/selectors/focus-visible-accesskey-expected.txt: Added.
• fast/selectors/focus-visible-accesskey.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/selectors/focus-visible-accesskey-expected.txt (added)
• LayoutTests/fast/selectors/focus-visible-accesskey.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/dom/Element.cpp (modified) (2 diffs)
• Source/WebCore/dom/Element.h (modified) (1 diff)
• Source/WebCore/dom/FocusOptions.h (modified) (1 diff)
• Source/WebCore/html/HTMLOrForeignElement.idl (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2022-01-04  Manuel Rego Casasnovas  <rego@igalia.com>
+
+        [selectors] :focus-visible not matching on accessKey focus after focusing something via mouse
+        https://bugs.webkit.org/show_bug.cgi?id=234077
+        <rdar://problem/86572561>
+
+        Reviewed by Antti Koivisto.
+
+        Writing an internal test as WPT tests for this don't work due to webkit.org/b/234139.
+
+        * fast/selectors/focus-visible-accesskey-expected.txt: Added.
+        * fast/selectors/focus-visible-accesskey.html: Added.
+
 2022-01-03  Diego Pino Garcia  <dpino@igalia.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2022-01-04  Manuel Rego Casasnovas  <rego@igalia.com>
+
+        [selectors] :focus-visible not matching on accessKey focus after focusing something via mouse
+        https://bugs.webkit.org/show_bug.cgi?id=234077
+        <rdar://problem/86572561>
+
+        Reviewed by Antti Koivisto.
+
+        This patch adds Element::focusForBindings() to differentitate when this is called from JavaScript.
+        If that's the case it pass a new FocusTrigger::Bindings value to Element::focus(),
+        so we can differentiate when this was called from some internal code or from JavaScript.
+
+        When Element::focus() has been called internally, we always want to show the focus ring
+        (thus pass FocusVisibility::Visible). However when it's called from a script
+        we'll set it to Visible or Invisible depending on if the previously focused element
+        was focused via mouse click or not (this is needed to pass
+        the css/selectors/focus-visible-script-focus-* tests from WPT repository).
+
+        Test: fast/selectors/focus-visible-accesskey.html
+
+        * dom/Element.cpp:
+        (WebCore::Element::focus):
+        (WebCore::Element::focusForBindings):
+        * dom/Element.h:
+        (WebCore::Element::focusForBindings):
+        * dom/FocusOptions.h:
+        * html/HTMLOrForeignElement.idl:
+
 2022-01-03  Alan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/dom/Element.cpp

@@ -3098 +3098 @@
 
         FocusOptions optionsWithVisibility = options;
-        if (!document->wasLastFocusByClick())
+        if (options.trigger == FocusTrigger::Bindings && document->wasLastFocusByClick())
+            optionsWithVisibility.visibility = FocusVisibility::Invisible;
+        else
             optionsWithVisibility.visibility = FocusVisibility::Visible;
 
@@ -3109 +3111 @@
 
     newTarget->findTargetAndUpdateFocusAppearance(options.selectionRestorationMode, options.preventScroll ? SelectionRevealMode::DoNotReveal : SelectionRevealMode::Reveal);
+}
+
+void Element::focusForBindings(FocusOptions&& options)
+{
+    options.trigger = FocusTrigger::Bindings;
+    focus(WTFMove(options));
 }
 

trunk/Source/WebCore/dom/Element.h

@@ -427 +427 @@
     static AXTextStateChangeIntent defaultFocusTextStateChangeIntent() { return AXTextStateChangeIntent(AXTextStateChangeTypeSelectionMove, AXTextSelection { AXTextSelectionDirectionDiscontiguous, AXTextSelectionGranularityUnknown, true }); }
     virtual void focus(const FocusOptions& = { });
+    virtual void focusForBindings(FocusOptions&&);
     void findTargetAndUpdateFocusAppearance(SelectionRestorationMode, SelectionRevealMode = SelectionRevealMode::Reveal);
     virtual RefPtr<Element> focusAppearanceUpdateTarget();

trunk/Source/WebCore/dom/FocusOptions.h

@@ -33 +33 @@
 enum class FocusRemovalEventsMode : bool { Dispatch, DoNotDispatch };
 
-enum class FocusTrigger : bool { Other, Click };
+enum class FocusTrigger : uint8_t { Other, Click, Bindings };
 
 enum class FocusVisibility : bool { Invisible, Visible };

trunk/Source/WebCore/html/HTMLOrForeignElement.idl

@@ -33 +33 @@
     [CEReactions=NotNeeded, Reflect] attribute boolean autofocus;
     [CEReactions, ImplementedAs=tabIndexForBindings] attribute long tabIndex;
-    undefined focus(optional FocusOptions options);
+    [ImplementedAs=focusForBindings] undefined focus(optional FocusOptions options);
     undefined blur();
 };