Changeset 295179 in webkit

Timestamp:

Jun 2, 2022, 11:45:17 PM (4 years ago)

Author:

Alan Coon

Message:

Cherry-pick 07c0107aa7af. rdar://problem/92301472

[selectors] Double script focus after mouse click shouldn't match :focus-visible
​https://bugs.webkit.org/show_bug.cgi?id=239472
<rdar://problem/92301472>

Reviewed by Antti Koivisto.

LayoutTests/imported/w3c:

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

Source/WebCore:

When you do the second script focus, we were setting
m_latestFocusTrigger to FocusTrigger::Bindings, that makes us lose the
information about the previous element that was focused via mouse
click and start matching :focus-visible on that case.

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

• dom/Document.cpp: (WebCore::Document::setFocusedElement): We avoid setting m_latestFocusTrigger if we come from script focus. That way we know if the previous focused element was focused via mouse click after several script focus.

Canonical link: ​https://commits.webkit.org/250373@main
git-svn-id: ​https://svn.webkit.org/repository/webkit/trunk@293926 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Location:

branches/safari-613-branch

Files:

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

branches/safari-613-branch/LayoutTests/imported/w3c/ChangeLog

@@ +1 @@
+2022-05-06  Manuel Rego Casasnovas  <rego@igalia.com>
+
+        [selectors] Double script focus after mouse click shouldn't match :focus-visible
+        https://bugs.webkit.org/show_bug.cgi?id=239472
+        <rdar://problem/92301472>
+
+        Reviewed by Antti Koivisto.
+
+        * web-platform-tests/css/selectors/focus-visible-script-focus-020-expected.txt: Added.
+        * web-platform-tests/css/selectors/focus-visible-script-focus-020.html: Added.
+
 2022-05-16  Alan Coon  <alancoon@apple.com>
 

branches/safari-613-branch/Source/WebCore/ChangeLog

@@ +1 @@
+2022-05-06  Manuel Rego Casasnovas  <rego@igalia.com>
+
+        [selectors] Double script focus after mouse click shouldn't match :focus-visible
+        https://bugs.webkit.org/show_bug.cgi?id=239472
+        <rdar://problem/92301472>
+
+        Reviewed by Antti Koivisto.
+
+        When you do the second script focus, we were setting
+        m_latestFocusTrigger to FocusTrigger::Bindings, that makes us lose the
+        information about the previous element that was focused via mouse
+        click and start matching :focus-visible on that case.
+
+        Test: imported/w3c/web-platform-tests/css/selectors/focus-visible-script-focus-020.html
+
+        * dom/Document.cpp:
+        (WebCore::Document::setFocusedElement): We avoid setting
+        m_latestFocusTrigger if we come from script focus. That way we know if
+        the previous focused element was focused via mouse click after several
+        script focus.
+
 2022-05-25  Alan Coon  <alancoon@apple.com>
 

branches/safari-613-branch/Source/WebCore/dom/Document.cpp

@@ -4672 +4672 @@
         setFocusNavigationStartingNode(m_focusedElement.get());
         m_focusedElement->setFocus(true, options.visibility);
-        m_latestFocusTrigger = options.trigger;
+        if (options.trigger != FocusTrigger::Bindings)
+            m_latestFocusTrigger = options.trigger;
 
         // The setFocus call triggers a blur and a focus event. Event handlers could cause the focused element to be cleared.