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 901088c22aaf904ad4dfbb1851a9afc2b897bc49..899b677f6eecfbe5538b82c2000b609972c29ba0 100644 |
--- a/third_party/WebKit/Source/core/events/EventPath.cpp |
+++ b/third_party/WebKit/Source/core/events/EventPath.cpp |
@@ -131,16 +131,7 @@ void EventPath::calculatePath() |
if (m_event && shouldStopAtShadowRoot(*m_event, *toShadowRoot(current), *m_node)) |
break; |
current = current->shadowHost(); |
-#if !ENABLE(OILPAN) |
- // TODO(kochi): crbug.com/507413 This check is necessary when some asynchronous event |
- // is queued while its shadow host is removed and the shadow root gets the event |
- // immediately after it. When Oilpan is enabled, this situation does not happen. |
- // Except this case, shadow root's host is assumed to be non-null. |
- if (current) |
- nodesInPath.append(current); |
-#else |
nodesInPath.append(current); |
-#endif |
} else { |
current = current->parentNode(); |
if (current) |
@@ -233,11 +224,9 @@ void EventPath::buildRelatedNodeMap(const Node& relatedNode, RelatedTargetMap& r |
TreeScopeEventContext* treeScopeEventContext = relatedTargetEventPath->m_treeScopeEventContexts[i].get(); |
relatedTargetMap.add(&treeScopeEventContext->treeScope(), treeScopeEventContext->target()); |
} |
-#if ENABLE(OILPAN) |
// Oilpan: It is important to explicitly clear the vectors to reuse |
// the memory in subsequent event dispatchings. |
relatedTargetEventPath->clear(); |
-#endif |
} |
EventTarget* EventPath::findRelatedNode(TreeScope& scope, RelatedTargetMap& relatedTargetMap) |