Changeset 200580 in webkit

Timestamp:

May 9, 2016 10:47:01 AM (8 years ago)

Author:

rniwa@webkit.org

Message:

REGRESSION (198056): Unable to use edit buttons on WordPress
​https://bugs.webkit.org/show_bug.cgi?id=157475

Reviewed by Antti Koivisto.

Source/WebCore:

Renamed Event.prototype.deepPath() to composedPath() per discussions on
​https://github.com/whatwg/dom/issues/242 as the old name was not Web compatible.

Test: fast/shadow-dom/Extensions-to-Event-Interface.html

• dom/Event.cpp:

(WebCore::Event::composedPath): Renamed from deepPath.

• dom/Event.h:
• dom/Event.idl:

LayoutTests:

Updated the tests.

• fast/shadow-dom/Extensions-to-Event-Interface-expected.txt:
• fast/shadow-dom/Extensions-to-Event-Interface.html:
• fast/shadow-dom/resources/event-path-test-helpers.js:

(dispatchEventWithLog):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/shadow-dom/Extensions-to-Event-Interface-expected.txt (modified) (2 diffs)
• LayoutTests/fast/shadow-dom/Extensions-to-Event-Interface.html (modified) (4 diffs)
• LayoutTests/fast/shadow-dom/resources/event-path-test-helpers.js (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/dom/Event.cpp (modified) (1 diff)
• Source/WebCore/dom/Event.h (modified) (1 diff)
• Source/WebCore/dom/Event.idl (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2016-05-09  Ryosuke Niwa  <rniwa@webkit.org>
+
+        REGRESSION (198056): Unable to use edit buttons on WordPress
+        https://bugs.webkit.org/show_bug.cgi?id=157475
+
+        Reviewed by Antti Koivisto.
+
+        Updated the tests.
+
+        * fast/shadow-dom/Extensions-to-Event-Interface-expected.txt:
+        * fast/shadow-dom/Extensions-to-Event-Interface.html:
+        * fast/shadow-dom/resources/event-path-test-helpers.js:
+        (dispatchEventWithLog):
+
 2016-05-09  Ryan Haddad  <ryanhaddad@apple.com>
 

trunk/LayoutTests/fast/shadow-dom/Extensions-to-Event-Interface-expected.txt

@@ -1 +1 @@
 
-PASS deepPath() must exist on Event 
-PASS deepPath() must return an empty array when the event has not been dispatched 
-PASS deepPath() must return an empty array when the event is no longer dispatched 
+PASS composedPath() must exist on Event 
+PASS composedPath() must return an empty array when the event has not been dispatched 
+PASS composedPath() must return an empty array when the event is no longer dispatched 
 PASS scoped must exist on Event 
 PASS scoped on EventInit must default to false 
@@ -21 +21 @@
 PASS The event must propagate out of open mode shadow tree in which the relative target and the relative related target are the same 
 PASS The event must propagate out of closed mode shadow tree in which the relative target and the relative related target are the same 
-PASS deepPath() must contain and only contain the unclosed nodes of target in open mode shadow trees 
-PASS deepPath() must contain and only contain the unclosed nodes of target in closed mode shadow trees 
+PASS composedPath() must contain and only contain the unclosed nodes of target in open mode shadow trees 
+PASS composedPath() must contain and only contain the unclosed nodes of target in closed mode shadow trees 
 

trunk/LayoutTests/fast/shadow-dom/Extensions-to-Event-Interface.html

@@ -4 +4 @@
 <title>Shadow DOM: Extensions to Event Interface</title>
 <meta name="author" title="Ryosuke Niwa" href="mailto:rniwa@webkit.org">
-<meta name="assert" content="Event interface must have deepPath() as a method">
+<meta name="assert" content="Event interface must have composedPath() as a method">
 <link rel="help" href="http://w3c.github.io/webcomponents/spec/shadow/#extensions-to-event-interface">
 <script src="../../resources/testharness.js"></script>
@@ -16 +16 @@
 
 test(function () {
-    assert_true('deepPath' in Event.prototype);
-    assert_true('deepPath' in new Event('my-event'));
-}, 'deepPath() must exist on Event');
-
-test(function () {
-    var event = new Event('my-event');
-    assert_array_equals(event.deepPath(), []);
-}, 'deepPath() must return an empty array when the event has not been dispatched');
+    assert_true('composedPath' in Event.prototype);
+    assert_true('composedPath' in new Event('my-event'));
+}, 'composedPath() must exist on Event');
+
+test(function () {
+    var event = new Event('my-event');
+    assert_array_equals(event.composedPath(), []);
+}, 'composedPath() must return an empty array when the event has not been dispatched');
 
 test(function () {
     var event = new Event('my-event');
     document.body.dispatchEvent(event);
-    assert_array_equals(event.deepPath(), []);
-}, 'deepPath() must return an empty array when the event is no longer dispatched');
+    assert_array_equals(event.composedPath(), []);
+}, 'composedPath() must return an empty array when the event is no longer dispatched');
 
 test(function () {
@@ -88 +88 @@
         assert_array_equals(log.pathAtTargets[1], expectedPath);
         assert_array_equals(log.pathAtTargets[2], mode == 'open' ? expectedPath : ['A1', 'A-SR', 'A'],
-            'deepPath must only contain unclosed nodes of the current target.');
+            'composedPath must only contain unclosed nodes of the current target.');
     }, 'The event must propagate out of ' + mode + ' mode shadow boundaries when the scoped flag is unset');
 }
@@ -275 +275 @@
         assert_array_equals(log.pathAtTargets[8], mode == 'open' ? expectedPath : pathExposedToB);
         assert_array_equals(log.relatedTargets, expectedRelatedTarget);
-    }, 'deepPath() must contain and only contain the unclosed nodes of target in ' + mode + ' mode shadow trees');
+    }, 'composedPath() must contain and only contain the unclosed nodes of target in ' + mode + ' mode shadow trees');
 }
 

trunk/LayoutTests/fast/shadow-dom/resources/event-path-test-helpers.js

@@ -16 +16 @@
                 relatedTargets.push(event.relatedTarget ? event.relatedTarget.label : null);
 
-                if (!event.deepPath) // Don't fail all tests just for the lack of deepPath.
+                if (!event.composedPath) // Don't fail all tests just for the lack of composedPath.
                     return;
 
-                pathAtTargets.push(event.deepPath().map(function (node) { return node.label; }));
+                pathAtTargets.push(event.composedPath().map(function (node) { return node.label; }));
             }).bind(node));
         }

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-05-09  Ryosuke Niwa  <rniwa@webkit.org>
+
+        REGRESSION (198056): Unable to use edit buttons on WordPress
+        https://bugs.webkit.org/show_bug.cgi?id=157475
+
+        Reviewed by Antti Koivisto.
+
+        Renamed Event.prototype.deepPath() to composedPath() per discussions on
+        https://github.com/whatwg/dom/issues/242 as the old name was not Web compatible.
+
+        Test: fast/shadow-dom/Extensions-to-Event-Interface.html
+
+        * dom/Event.cpp:
+        (WebCore::Event::composedPath): Renamed from deepPath.
+        * dom/Event.h:
+        * dom/Event.idl:
+
 2016-05-09  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebCore/dom/Event.cpp

@@ -188 +188 @@
 }
 
-Vector<EventTarget*> Event::deepPath() const
+Vector<EventTarget*> Event::composedPath() const
 {
     if (!m_eventPath)

trunk/Source/WebCore/dom/Event.h

@@ -125 +125 @@
     void setEventPath(const EventPath& path) { m_eventPath = &path; }
     void clearEventPath() { m_eventPath = nullptr; }
-    Vector<EventTarget*> deepPath() const;
+    Vector<EventTarget*> composedPath() const;
 
     void stopPropagation() { m_propagationStopped = true; }

trunk/Source/WebCore/dom/Event.idl

@@ -62 +62 @@
     readonly attribute DOMTimeStamp     timeStamp;
 
-    [Conditional=SHADOW_DOM, EnabledAtRuntime=ShadowDOM] sequence<Node> deepPath();
+    [Conditional=SHADOW_DOM, EnabledAtRuntime=ShadowDOM] sequence<Node> composedPath();
 
     void               stopPropagation();