Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(453)

Unified Diff: third_party/WebKit/Source/core/events/EventPath.cpp

Issue 1606153002: Implement v1 slot logic in EventPath (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Modify the layout test Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/WebKit/LayoutTests/fast/dom/shadow/event-path-with-slot.html ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/events/EventPath.cpp
diff --git a/third_party/WebKit/Source/core/events/EventPath.cpp b/third_party/WebKit/Source/core/events/EventPath.cpp
index b958b89089ed270a78e7d1c8bc5464aa4ad8c40b..54175abd8187e80108dcf4befd82cc5ff9af9db8 100644
--- a/third_party/WebKit/Source/core/events/EventPath.cpp
+++ b/third_party/WebKit/Source/core/events/EventPath.cpp
@@ -34,6 +34,7 @@
#include "core/dom/shadow/ShadowRoot.h"
#include "core/events/TouchEvent.h"
#include "core/events/TouchEventContext.h"
+#include "core/html/HTMLSlotElement.h"
namespace blink {
@@ -127,6 +128,13 @@ void EventPath::calculatePath()
current = insertionPoints.last();
continue;
}
+ if (current->isChildOfV1ShadowHost()) {
+ if (HTMLSlotElement* slot = current->assignedSlot()) {
+ current = slot;
+ nodesInPath.append(current);
+ continue;
+ }
+ }
if (current->isShadowRoot()) {
if (m_event && shouldStopAtShadowRoot(*m_event, *toShadowRoot(current), *m_node))
break;
« no previous file with comments | « third_party/WebKit/LayoutTests/fast/dom/shadow/event-path-with-slot.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698