| Index: third_party/WebKit/Source/core/dom/TreeScope.cpp
|
| diff --git a/third_party/WebKit/Source/core/dom/TreeScope.cpp b/third_party/WebKit/Source/core/dom/TreeScope.cpp
|
| index 3ef34953971daa4b38e5226a8930cae4be902b5f..0d84ee524f2d9917e59647916df8890c15b86c77 100644
|
| --- a/third_party/WebKit/Source/core/dom/TreeScope.cpp
|
| +++ b/third_party/WebKit/Source/core/dom/TreeScope.cpp
|
| @@ -198,7 +198,7 @@ void TreeScope::removeElementById(const AtomicString& elementId, Element* elemen
|
| Node* TreeScope::ancestorInThisScope(Node* node) const
|
| {
|
| while (node) {
|
| - if (node->treeScope() == this)
|
| + if (node->treeScopeOrDocument() == this)
|
| return node;
|
| if (!node->isInShadowTree())
|
| return nullptr;
|
| @@ -432,7 +432,7 @@ Element* TreeScope::adjustedFocusedElement() const
|
| if (rootNode().isInV1ShadowTree()) {
|
| if (Node* retargeted = rootNode().retarget(*element)) {
|
| DCHECK(retargeted->isElementNode());
|
| - return this == &retargeted->treeScope() ? toElement(retargeted) : nullptr;
|
| + return this == &retargeted->treeScopeOrDocument() ? toElement(retargeted) : nullptr;
|
| }
|
| return nullptr;
|
| }
|
|
|