| 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..7ab6c69760fdb1b21a8e0cfef54b16f35b56e9f9 100644
|
| --- a/third_party/WebKit/Source/core/events/EventPath.cpp
|
| +++ b/third_party/WebKit/Source/core/events/EventPath.cpp
|
| @@ -215,7 +215,7 @@ void EventPath::calculateAdjustedTargets()
|
|
|
| for (size_t i = 0; i < size(); ++i) {
|
| Node* currentNode = at(i).node();
|
| - TreeScope& currentTreeScope = currentNode->treeScope();
|
| + TreeScope& currentTreeScope = currentNode->treeScopeOrDocument();
|
| if (lastTreeScope != ¤tTreeScope) {
|
| lastTreeScopeEventContext = ensureTreeScopeEventContext(currentNode, ¤tTreeScope, treeScopeEventContextMap);
|
| }
|
| @@ -290,7 +290,7 @@ void EventPath::shrinkIfNeeded(const Node& target, const EventTarget& relatedTar
|
|
|
| for (size_t i = 0; i < size(); ++i) {
|
| if (targetIsIdenticalToToRelatedTarget) {
|
| - if (target.treeScope().rootNode() == at(i).node()) {
|
| + if (target.treeScopeOrDocument().rootNode() == at(i).node()) {
|
| shrink(i + 1);
|
| break;
|
| }
|
| @@ -370,7 +370,7 @@ void EventPath::ensureWindowEventContext()
|
| void EventPath::checkReachability(TreeScope& treeScope, TouchList& touchList)
|
| {
|
| for (size_t i = 0; i < touchList.length(); ++i)
|
| - ASSERT(touchList.item(i)->target()->toNode()->treeScope().isInclusiveOlderSiblingShadowRootOrAncestorTreeScopeOf(treeScope));
|
| + ASSERT(touchList.item(i)->target()->toNode()->treeScopeOrDocument().isInclusiveOlderSiblingShadowRootOrAncestorTreeScopeOf(treeScope));
|
| }
|
| #endif
|
|
|
|
|