Changeset 289521 in webkit

Timestamp:

Feb 10, 2022 12:10:04 AM (5 months ago)

Author:

Manuel Rego Casasnovas

Message:

:focus-visible with click on radio/checkbox labels is broken
​https://bugs.webkit.org/show_bug.cgi?id=236331

Reviewed by Antti Koivisto.

LayoutTests/imported/w3c:

Added new WPT test to cover this case.

• web-platform-tests/css/selectors/focus-visible-026-expected.txt: Added.
• web-platform-tests/css/selectors/focus-visible-026.html: Added.

Source/WebCore:

When the label is clicked we have to send the FocusTrigger information to Element::focus().
There we avoid setting FocusVisibility:Visible if it has been triggered via mouse click.

Test: imported/w3c/web-platform-tests/css/selectors/focus-visible-026.html

• dom/Element.cpp:

(WebCore::Element::focus): Add a check for FocusTrigger::Click to avoid setting FocusVisibility:Visible.

• html/HTMLLabelElement.cpp:

(WebCore::HTMLLabelElement::defaultEventHandler): Pass FocusTrigger::Click.

Location:

trunk

Files:

• LayoutTests/imported/w3c/ChangeLog (modified) (1 diff)
• LayoutTests/imported/w3c/web-platform-tests/css/selectors/focus-visible-026-expected.txt (added)
• LayoutTests/imported/w3c/web-platform-tests/css/selectors/focus-visible-026.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/dom/Element.cpp (modified) (1 diff)
• Source/WebCore/html/HTMLLabelElement.cpp (modified) (1 diff)

trunk/LayoutTests/imported/w3c/ChangeLog

@@ +1 @@
+2022-02-10  Manuel Rego Casasnovas  <rego@igalia.com>
+
+        :focus-visible with click on radio/checkbox labels is broken
+        https://bugs.webkit.org/show_bug.cgi?id=236331
+
+        Reviewed by Antti Koivisto.
+
+        Added new WPT test to cover this case.
+
+        * web-platform-tests/css/selectors/focus-visible-026-expected.txt: Added.
+        * web-platform-tests/css/selectors/focus-visible-026.html: Added.
+
 2022-02-09  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2022-02-10  Manuel Rego Casasnovas  <rego@igalia.com>
+
+        :focus-visible with click on radio/checkbox labels is broken
+        https://bugs.webkit.org/show_bug.cgi?id=236331
+
+        Reviewed by Antti Koivisto.
+
+        When the label is clicked we have to send the FocusTrigger information to Element::focus().
+        There we avoid setting FocusVisibility:Visible if it has been triggered via mouse click.
+
+        Test: imported/w3c/web-platform-tests/css/selectors/focus-visible-026.html
+
+        * dom/Element.cpp:
+        (WebCore::Element::focus): Add a check for FocusTrigger::Click to avoid setting FocusVisibility:Visible.
+        * html/HTMLLabelElement.cpp:
+        (WebCore::HTMLLabelElement::defaultEventHandler): Pass FocusTrigger::Click.
+
 2022-02-09  Said Abou-Hallawa  <said@apple.com>
 

trunk/Source/WebCore/dom/Element.cpp

@@ -3110 +3110 @@
         if (options.trigger == FocusTrigger::Bindings && document->wasLastFocusByClick())
             optionsWithVisibility.visibility = FocusVisibility::Invisible;
-        else
+        else if (options.trigger != FocusTrigger::Click)
             optionsWithVisibility.visibility = FocusVisibility::Visible;
 

trunk/Source/WebCore/html/HTMLLabelElement.cpp

@@ -158 +158 @@
         document().updateLayoutIgnorePendingStylesheets();
         if (control->isMouseFocusable())
-            control->focus();
+            control->focus({ { }, { }, { }, FocusTrigger::Click, { } });
 
         processingClick = false;