summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoryuzus <yuzus@chromium.org>2016-02-17 21:48:15 -0800
committerCommit bot <commit-bot@chromium.org>2016-02-18 05:49:16 +0000
commit074da65f2d82b187dc44c5c5be09d3fec100d63d (patch)
treec9d6e0a932ed8b31cf129553c2079c18beeb64c7
parent965aad97d3fb18f575ee27371ae2917caada250c (diff)
downloadchromium_src-074da65f2d82b187dc44c5c5be09d3fec100d63d.zip
chromium_src-074da65f2d82b187dc44c5c5be09d3fec100d63d.tar.gz
chromium_src-074da65f2d82b187dc44c5c5be09d3fec100d63d.tar.bz2
Change Event.deepPath to a method
In order to make clear that computation is performed, Event.deepPath has been changed to a method Event.deepPath(), that returns sequence<EventTarget>. See the discussion here: https://github.com/w3c/webcomponents/issues/361 Described in the spec here : http://w3c.github.io/webcomponents/spec/shadow/#widl-Event-deepPath-sequence-EventTarget See the spec change here: https://github.com/w3c/webcomponents/commit/ed93413f9a37a6bfbd774cb2e09e14a76c87d56c BUG=531990 Committed: https://crrev.com/b9279be7d61887c171d5c1cefa114292c84b9957 Cr-Commit-Position: refs/heads/master@{#372596} Review URL: https://codereview.chromium.org/1637813002 Cr-Commit-Position: refs/heads/master@{#376103}
-rw-r--r--third_party/WebKit/LayoutTests/fast/dom/shadow/event-deep-path.html4
-rw-r--r--third_party/WebKit/LayoutTests/fast/xmlhttprequest/xmlhttprequest-get-expected.txt2
-rw-r--r--third_party/WebKit/LayoutTests/http/tests/serviceworker/webexposed/global-interface-listing-service-worker-expected.txt2
-rw-r--r--third_party/WebKit/LayoutTests/webexposed/global-interface-listing-dedicated-worker-expected.txt2
-rw-r--r--third_party/WebKit/LayoutTests/webexposed/global-interface-listing-expected.txt2
-rw-r--r--third_party/WebKit/LayoutTests/webexposed/global-interface-listing-shared-worker-expected.txt2
-rw-r--r--third_party/WebKit/Source/core/events/Event.idl3
-rw-r--r--third_party/WebKit/Source/devtools/front_end/ui/Tooltip.js2
8 files changed, 10 insertions, 9 deletions
diff --git a/third_party/WebKit/LayoutTests/fast/dom/shadow/event-deep-path.html b/third_party/WebKit/LayoutTests/fast/dom/shadow/event-deep-path.html
index 79056f3..8af649e 100644
--- a/third_party/WebKit/LayoutTests/fast/dom/shadow/event-deep-path.html
+++ b/third_party/WebKit/LayoutTests/fast/dom/shadow/event-deep-path.html
@@ -7,8 +7,8 @@
img.onload = function(e) {
test(function() {
- assert_array_equals(e.deepPath, e.path);
- }, "Event.deepPath should be the same as Event.path.");
+ assert_array_equals(e.deepPath(), e.path);
+ }, "Event.deepPath() should be the same as Event.path.");
};
</script>
diff --git a/third_party/WebKit/LayoutTests/fast/xmlhttprequest/xmlhttprequest-get-expected.txt b/third_party/WebKit/LayoutTests/fast/xmlhttprequest/xmlhttprequest-get-expected.txt
index ce777f6..f534286 100644
--- a/third_party/WebKit/LayoutTests/fast/xmlhttprequest/xmlhttprequest-get-expected.txt
+++ b/third_party/WebKit/LayoutTests/fast/xmlhttprequest/xmlhttprequest-get-expected.txt
@@ -47,7 +47,7 @@ bubbles : 'false'
cancelBubble : 'false'
cancelable : 'false'
currentTarget : '[object XMLHttpRequest]'
-deepPath : ''
+deepPath : 'function deepPath() { [native code] }'
defaultPrevented : 'false'
eventPhase : '2'
initEvent : 'function initEvent() { [native code] }'
diff --git a/third_party/WebKit/LayoutTests/http/tests/serviceworker/webexposed/global-interface-listing-service-worker-expected.txt b/third_party/WebKit/LayoutTests/http/tests/serviceworker/webexposed/global-interface-listing-service-worker-expected.txt
index 953ba71..33a8b91 100644
--- a/third_party/WebKit/LayoutTests/http/tests/serviceworker/webexposed/global-interface-listing-service-worker-expected.txt
+++ b/third_party/WebKit/LayoutTests/http/tests/serviceworker/webexposed/global-interface-listing-service-worker-expected.txt
@@ -145,7 +145,6 @@ interface Event
getter cancelBubble
getter cancelable
getter currentTarget
- getter deepPath
getter defaultPrevented
getter eventPhase
getter path
@@ -156,6 +155,7 @@ interface Event
getter timeStamp
getter type
method constructor
+ method deepPath
method initEvent
method preventDefault
method stopImmediatePropagation
diff --git a/third_party/WebKit/LayoutTests/webexposed/global-interface-listing-dedicated-worker-expected.txt b/third_party/WebKit/LayoutTests/webexposed/global-interface-listing-dedicated-worker-expected.txt
index 7e48f91..226173a 100644
--- a/third_party/WebKit/LayoutTests/webexposed/global-interface-listing-dedicated-worker-expected.txt
+++ b/third_party/WebKit/LayoutTests/webexposed/global-interface-listing-dedicated-worker-expected.txt
@@ -148,7 +148,6 @@ Starting worker: resources/global-interface-listing.js
[Worker] getter cancelBubble
[Worker] getter cancelable
[Worker] getter currentTarget
-[Worker] getter deepPath
[Worker] getter defaultPrevented
[Worker] getter eventPhase
[Worker] getter path
@@ -159,6 +158,7 @@ Starting worker: resources/global-interface-listing.js
[Worker] getter timeStamp
[Worker] getter type
[Worker] method constructor
+[Worker] method deepPath
[Worker] method initEvent
[Worker] method preventDefault
[Worker] method stopImmediatePropagation
diff --git a/third_party/WebKit/LayoutTests/webexposed/global-interface-listing-expected.txt b/third_party/WebKit/LayoutTests/webexposed/global-interface-listing-expected.txt
index ff504ec..5006df5 100644
--- a/third_party/WebKit/LayoutTests/webexposed/global-interface-listing-expected.txt
+++ b/third_party/WebKit/LayoutTests/webexposed/global-interface-listing-expected.txt
@@ -1396,7 +1396,6 @@ interface Event
getter cancelBubble
getter cancelable
getter currentTarget
- getter deepPath
getter defaultPrevented
getter eventPhase
getter path
@@ -1407,6 +1406,7 @@ interface Event
getter timeStamp
getter type
method constructor
+ method deepPath
method initEvent
method preventDefault
method stopImmediatePropagation
diff --git a/third_party/WebKit/LayoutTests/webexposed/global-interface-listing-shared-worker-expected.txt b/third_party/WebKit/LayoutTests/webexposed/global-interface-listing-shared-worker-expected.txt
index 9be1a47..2893651 100644
--- a/third_party/WebKit/LayoutTests/webexposed/global-interface-listing-shared-worker-expected.txt
+++ b/third_party/WebKit/LayoutTests/webexposed/global-interface-listing-shared-worker-expected.txt
@@ -136,7 +136,6 @@ Starting worker: resources/global-interface-listing.js
[Worker] getter cancelBubble
[Worker] getter cancelable
[Worker] getter currentTarget
-[Worker] getter deepPath
[Worker] getter defaultPrevented
[Worker] getter eventPhase
[Worker] getter path
@@ -147,6 +146,7 @@ Starting worker: resources/global-interface-listing.js
[Worker] getter timeStamp
[Worker] getter type
[Worker] method constructor
+[Worker] method deepPath
[Worker] method initEvent
[Worker] method preventDefault
[Worker] method stopImmediatePropagation
diff --git a/third_party/WebKit/Source/core/events/Event.idl b/third_party/WebKit/Source/core/events/Event.idl
index 8f81b79..4157a4c 100644
--- a/third_party/WebKit/Source/core/events/Event.idl
+++ b/third_party/WebKit/Source/core/events/Event.idl
@@ -66,7 +66,8 @@
// Shadow DOM
// https://w3c.github.io/webcomponents/spec/shadow/#extensions-to-event-interface
[MeasureAs=EventPath, CallWith=ScriptState] readonly attribute EventTarget[] path;
- [RuntimeEnabled=ShadowDOMV1, ImplementedAs=path, MeasureAs=EventDeepPath, CallWith=ScriptState] readonly attribute EventTarget[] deepPath;
+ [RuntimeEnabled=ShadowDOMV1, ImplementedAs=path, MeasureAs=EventDeepPath, CallWith=ScriptState] sequence<EventTarget> deepPath();
+
// Non-standard APIs
const unsigned short MOUSEDOWN = 1;
const unsigned short MOUSEUP = 2;
diff --git a/third_party/WebKit/Source/devtools/front_end/ui/Tooltip.js b/third_party/WebKit/Source/devtools/front_end/ui/Tooltip.js
index 26e2442..9dd3547 100644
--- a/third_party/WebKit/Source/devtools/front_end/ui/Tooltip.js
+++ b/third_party/WebKit/Source/devtools/front_end/ui/Tooltip.js
@@ -33,7 +33,7 @@ WebInspector.Tooltip.prototype = {
*/
_mouseMove: function(event)
{
- var path = event.path;
+ var path = event.deepPath() ? event.deepPath() : event.path;
if (!path || event.buttons !== 0)
return;