Changeset 105123 in webkit

Timestamp:

Jan 16, 2012 7:56:16 PM (12 years ago)

Author:

hayato@chromium.org

Message:

Implement multiple AT_TARGET event dispatching in regard to shadow tree.
​https://bugs.webkit.org/show_bug.cgi?id=76217

Reviewed by Dimitri Glazkov.

The original motivation is to fix the regression: Event.eventPhase is not set to 2
(at target) when handling dblclick event in <input> element.
Since the issue is not specific to <input> element, but general one, this patch fixes
the regression by adapting a living draft spec of shadow DOM.
This won't break a compatibility if there is no shadow boundaries in event dispatching.
See the following shadow dom spec how multiple AT_TARGET events work.
​http://dvcs.w3.org/hg/webcomponents/raw-file/tip/spec/shadow/index.html#event-dispatch

Source/WebCore:

• dom/EventContext.cpp:

(WebCore::EventContext::handleLocalEvents):

LayoutTests:

• fast/dom/shadow/shadow-boundary-events-expected.txt:
• fast/dom/shadow/shadow-boundary-events.html:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/dom/shadow/shadow-boundary-events-expected.txt (modified) (1 diff)
• LayoutTests/fast/dom/shadow/shadow-boundary-events.html (modified) (2 diffs)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/dom/EventContext.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-01-16  Hayato Ito  <hayato@chromium.org>
+
+        Implement multiple AT_TARGET event dispatching in regard to shadow tree.
+        https://bugs.webkit.org/show_bug.cgi?id=76217
+
+        Reviewed by Dimitri Glazkov.
+
+        The original motivation is to fix the regression: Event.eventPhase is not set to 2
+        (at target) when handling dblclick event in <input> element.
+        Since the issue is not specific to <input> element, but general one, this patch fixes
+        the regression by adapting a living draft spec of shadow DOM.
+        This won't break a compatibility if there is no shadow boundaries in event dispatching.
+        See the following shadow dom spec how multiple AT_TARGET events work.
+        http://dvcs.w3.org/hg/webcomponents/raw-file/tip/spec/shadow/index.html#event-dispatch
+
+        * fast/dom/shadow/shadow-boundary-events-expected.txt:
+        * fast/dom/shadow/shadow-boundary-events.html:
+
 2012-01-16  Robert Hogan  <robert@webkit.org>
 

trunk/LayoutTests/fast/dom/shadow/shadow-boundary-events-expected.txt

@@ -77 +77 @@
 Old focused node and new focused node exist in separated subtrees, crossing shadow boundaries. Making sure that an event is not dispatched beyond the lowest common boundary.
 Moving focus from shadowD/shadowF/shadowG/divH to shadowD/shadowK/divL
-PASS dispatchedEvent("focus") is ["shadowK(@divJ)(capturing phase)", "shadowK(@shadowK)(capturing phase)", "divL(@divL)"]
-PASS dispatchedEvent("blur") is ["shadowF(@divE)(capturing phase)", "shadowF(@shadowF)(capturing phase)", "shadowG(@shadowG)(capturing phase)", "divH(@divH)"]
+PASS dispatchedEvent("focus") is ["shadowK(@divJ)(capturing phase)", "shadowK(@shadowK)", "divL(@divL)"]
+PASS dispatchedEvent("blur") is ["shadowF(@divE)(capturing phase)", "shadowF(@shadowF)", "shadowG(@shadowG)", "divH(@divH)"]
 PASS successfullyParsed is true
 

trunk/LayoutTests/fast/dom/shadow/shadow-boundary-events.html

@@ -60 +60 @@
     if (event.eventPhase == 1)
         eventString += '(capturing phase)';
+    if (event.target && event.currentTarget && event.target.id == event.currentTarget.id)
+        shouldBe("event.eventPhase", "2", true);
     eventRecords[eventType].push(eventString);
 }
@@ -205 +207 @@
     moveFocus('shadowD/shadowF/shadowG/divH', 'shadowD/shadowK/divL',
               'Old focused node and new focused node exist in separated subtrees, crossing shadow boundaries. Making sure that an event is not dispatched beyond the lowest common boundary.');
-    shouldBe('dispatchedEvent("focus")', '["shadowK(@divJ)(capturing phase)", "shadowK(@shadowK)(capturing phase)", "divL(@divL)"]');
-    shouldBe('dispatchedEvent("blur")', '["shadowF(@divE)(capturing phase)", "shadowF(@shadowF)(capturing phase)", "shadowG(@shadowG)(capturing phase)", "divH(@divH)"]');
+    shouldBe('dispatchedEvent("focus")', '["shadowK(@divJ)(capturing phase)", "shadowK(@shadowK)", "divL(@divL)"]');
+    shouldBe('dispatchedEvent("blur")', '["shadowF(@divE)(capturing phase)", "shadowF(@shadowF)", "shadowG(@shadowG)", "divH(@divH)"]');
 }
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-01-16  Hayato Ito  <hayato@chromium.org>
+
+        Implement multiple AT_TARGET event dispatching in regard to shadow tree.
+        https://bugs.webkit.org/show_bug.cgi?id=76217
+
+        Reviewed by Dimitri Glazkov.
+
+        The original motivation is to fix the regression: Event.eventPhase is not set to 2
+        (at target) when handling dblclick event in <input> element.
+        Since the issue is not specific to <input> element, but general one, this patch fixes
+        the regression by adapting a living draft spec of shadow DOM.
+        This won't break a compatibility if there is no shadow boundaries in event dispatching.
+        See the following shadow dom spec how multiple AT_TARGET events work.
+        http://dvcs.w3.org/hg/webcomponents/raw-file/tip/spec/shadow/index.html#event-dispatch
+
+        * dom/EventContext.cpp:
+        (WebCore::EventContext::handleLocalEvents):
+
 2012-01-16  Jason Liu  <jason.liu@torchmobile.com.cn>
 

trunk/Source/WebCore/dom/EventContext.cpp

@@ -44 +44 @@
 void EventContext::handleLocalEvents(Event* event) const
 {
+    unsigned short eventPhase = event->eventPhase();
+    if (m_target.get() == m_currentTarget.get()) {
+        if (eventPhase == Event::CAPTURING_PHASE && event->bubbles())
+            return;
+        event->setEventPhase(Event::AT_TARGET);
+    }
     event->setTarget(m_target.get());
     event->setCurrentTarget(m_currentTarget.get());
     m_node->handleLocalEvents(event);
+    event->setEventPhase(eventPhase);
 }