Changeset 72796 in webkit

Timestamp:

Nov 29, 2010 7:12:39 AM (13 years ago)

Author:

Dimitri Glazkov

Message:

2010-11-29 Dimitri Glazkov <Dimitri Glazkov>

Reviewed by Darin Adler.

Use the right focusable check to avoid multiple focus/blur events being fired from inside of the shadow DOM.
​https://bugs.webkit.org/show_bug.cgi?id=49977

• fast/events/shadow-boundary-crossing-2.html: Added a test for multiple focus events.
• fast/events/shadow-boundary-crossing-2-expected.txt: Added new test expectation.

2010-11-29 Dimitri Glazkov <Dimitri Glazkov>

Reviewed by Darin Adler.

Use the right focusable check to avoid multiple focus/blur events being fired from inside of the shadow DOM.
​https://bugs.webkit.org/show_bug.cgi?id=49977

• editing/SelectionController.cpp: (WebCore::SelectionController::setFocusedNodeIfNeeded): Added a FIXME to remove redundant code.
• page/EventHandler.cpp: (WebCore::EventHandler::dispatchMouseEvent): Changed to use isMouseFocusable, which is what shadow DOM elements

override, and added a FIXME to convert to use shadow DOM-aware traversal instead of render tree traversal.

Test: fast/events/shadow-boundary-crossing-2.html

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/events/shadow-boundary-crossing-2-expected.txt (modified) (1 diff)
• LayoutTests/fast/events/shadow-boundary-crossing-2.html (modified) (2 diffs)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/editing/SelectionController.cpp (modified) (1 diff)
• WebCore/page/EventHandler.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-11-29  Dimitri Glazkov  <dglazkov@chromium.org>
+
+        Reviewed by Darin Adler.
+
+        Use the right focusable check to avoid multiple focus/blur events being fired from inside of the shadow DOM.
+        https://bugs.webkit.org/show_bug.cgi?id=49977
+
+        * fast/events/shadow-boundary-crossing-2.html: Added a test for multiple focus events.
+        * fast/events/shadow-boundary-crossing-2-expected.txt: Added new test expectation.
+
 2010-11-29  Yael Aharon  <yael.aharon@nokia.com>
 

trunk/LayoutTests/fast/events/shadow-boundary-crossing-2-expected.txt

@@ -7 +7 @@
 Other events should be retargeted: PASS
 After event dispatch, the event object should not reveal shadow DOM: PASS
+Focusing same shadow DOM element repeatedly should not trigger multiple focus/blur events: PASS

trunk/LayoutTests/fast/events/shadow-boundary-crossing-2.html

@@ -20 +20 @@
     eventSender.mouseDown();
     eventSender.mouseUp();
+}
+
+
+function leapForward()
+{
+    if (!window.eventSender)
+        return;
+
+    eventSender.leapForward(1000);
 }
 
@@ -74 +83 @@
         log('After event dispatch, the event object should not reveal shadow DOM', storedEvent && storedEvent.target == textInput);
         textInput.parentNode.removeChild(textInput);
+    },
+    focusEventPropagation: function()
+    {
+        var searchInput = document.body.appendChild(document.createElement('input'));
+        searchInput.setAttribute('type', 'search');
+        var count = 0;
+        searchInput.addEventListener('focus', function(evt)
+        {
+            count++;
+        });
+        clickOn(searchInput);
+        leapForward();
+        clickOn(searchInput);
+        log('Focusing same shadow DOM element repeatedly should not trigger multiple focus/blur events', count == 1);
+        searchInput.parentNode.removeChild(searchInput);
     }
 };

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-11-29  Dimitri Glazkov  <dglazkov@chromium.org>
+
+        Reviewed by Darin Adler.
+
+        Use the right focusable check to avoid multiple focus/blur events being fired from inside of the shadow DOM.
+        https://bugs.webkit.org/show_bug.cgi?id=49977
+
+        * editing/SelectionController.cpp:
+        (WebCore::SelectionController::setFocusedNodeIfNeeded): Added a FIXME to remove redundant code.
+        * page/EventHandler.cpp:
+        (WebCore::EventHandler::dispatchMouseEvent): Changed to use isMouseFocusable, which is what shadow DOM elements
+            override, and added a FIXME to convert to use shadow DOM-aware traversal instead of render tree traversal.
+
+        Test: fast/events/shadow-boundary-crossing-2.html
+
 2010-11-29  Adam Roben  <aroben@apple.com>
 

trunk/WebCore/editing/SelectionController.cpp

@@ -1556 +1556 @@
         // Walk up the render tree to search for a node to focus.
         // Walking up the DOM tree wouldn't work for shadow trees, like those behind the engine-based text fields.
+        // FIXME: Combine with the same traversal code in EventHandle::dispatchMouseEvent.
         while (renderer) {
             // We don't want to set focus on a subframe when selecting in a parent frame,

trunk/WebCore/page/EventHandler.cpp

@@ -1860 +1860 @@
         // Walk up the render tree to search for a node to focus.
         // Walking up the DOM tree wouldn't work for shadow trees, like those behind the engine-based text fields.
+        // FIXME: Rework to use shadowParent. No need to traverse with the render tree.
         while (renderer) {
             node = renderer->node();
-            if (node && node->isFocusable()) {
+            if (node && node->isMouseFocusable()) {
                 // To fix <rdar://problem/4895428> Can't drag selected ToDo, we don't focus a 
                 // node on mouse down if it's selected and inside a focused node. It will be