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

Unified Diff: third_party/WebKit/Source/core/dom/TreeScope.cpp

Issue 1885453002: Rename Node::treeScope() to Node::treeScopeOrDocument() Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebased Created 4 years, 8 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
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;
}
« no previous file with comments | « third_party/WebKit/Source/core/dom/StyleEngine.cpp ('k') | third_party/WebKit/Source/core/dom/TreeScopeAdopter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698