third_party/WebKit/Source/core/dom/SelectorQuery.cpp - Issue 1883083002: Introduce Node::containingTreeScope(), which asserts that the node's root is a tree scope

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1883083002: Introduce Node::containingTreeScope(), which asserts that the node's root is a tree scope (Closed) 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

« third_party/WebKit/Source/core/dom/Element.cpp ('K') | « third_party/WebKit/Source/core/dom/Node.cpp ('k') | third_party/WebKit/Source/core/page/FocusController.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/dom/SelectorQuery.cpp

diff --git a/third_party/WebKit/Source/core/dom/SelectorQuery.cpp b/third_party/WebKit/Source/core/dom/SelectorQuery.cpp

index 76151d5b7a6e76c76c574bdb5273c2663968327e..0335588ad655fb49ccb8cbd411e0d799d90ce268 100644

--- a/third_party/WebKit/Source/core/dom/SelectorQuery.cpp

+++ b/third_party/WebKit/Source/core/dom/SelectorQuery.cpp

@@ -261,8 +261,8 @@ void SelectorDataList::findTraverseRootsAndExecute(ContainerNode& rootNode, type

bool startFromParent = false;

for (const CSSSelector* selector = m_selectors[0]; selector; selector = selector->tagHistory()) {

- if (selector->match() == CSSSelector::Id && !rootNode.treeScope().containsMultipleElementsWithId(selector->value())) {

- Element* element = rootNode.treeScope().getElementById(selector->value());

+ if (selector->match() == CSSSelector::Id && rootNode.isInTreeScope() && !rootNode.rootTreeScope().containsMultipleElementsWithId(selector->value())) {

+ Element* element = rootNode.rootTreeScope().getElementById(selector->value());

ContainerNode* adjustedNode = &rootNode;

if (element && (isTreeScopeRoot(rootNode) || element->isDescendantOf(&rootNode)))

adjustedNode = element;