third_party/WebKit/Source/core/css/resolver/StyleResolver.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/css/resolver/StyleResolver.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: renamed Created 4 years, 7 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

« no previous file with comments | « third_party/WebKit/Source/core/css/ElementRuleCollector.cpp ('k') | third_party/WebKit/Source/core/dom/ContainerNode.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/css/resolver/StyleResolver.cpp

diff --git a/third_party/WebKit/Source/core/css/resolver/StyleResolver.cpp b/third_party/WebKit/Source/core/css/resolver/StyleResolver.cpp

index 5940ae92c01354bcc0655cc32c28950f923f917c..e32c6e9fbfe854077b111d8040d673cecba374b1 100644

--- a/third_party/WebKit/Source/core/css/resolver/StyleResolver.cpp

+++ b/third_party/WebKit/Source/core/css/resolver/StyleResolver.cpp

@@ -512,15 +512,15 @@ void StyleResolver::matchScopedRules(const Element& element, ElementRuleCollecto

bool matchElementScopeDone = !elementScopeResolver && !element.inlineStyle();

for (auto it = m_treeBoundaryCrossingScopes.rbegin(); it != m_treeBoundaryCrossingScopes.rend(); ++it) {

- const TreeScope& scope = (*it)->treeScope();

+ const TreeScope& scope = (*it)->containingTreeScope();

ScopedStyleResolver* resolver = scope.scopedStyleResolver();

ASSERT(resolver);

- bool isInnerTreeScope = element.treeScope().isInclusiveAncestorOf(scope);

+ bool isInnerTreeScope = element.containingTreeScope().isInclusiveAncestorOf(scope);

if (!shouldCheckScope(element, **it, isInnerTreeScope))

continue;

- if (!matchElementScopeDone && scope.isInclusiveAncestorOf(element.treeScope())) {

+ if (!matchElementScopeDone && scope.isInclusiveAncestorOf(element.containingTreeScope())) {

matchElementScopeDone = true;

@@ -660,7 +660,7 @@ void StyleResolver::collectTreeBoundaryCrossingRules(const Element& element, Ele

for (const auto& scopingNode : m_treeBoundaryCrossingScopes) {

// Skip rule collection for element when tree boundary crossing rules of scopingNode's

// scope can never apply to it.

- bool isInnerTreeScope = element.treeScope().isInclusiveAncestorOf(scopingNode->treeScope());

+ bool isInnerTreeScope = element.containingTreeScope().isInclusiveAncestorOf(scopingNode->containingTreeScope());

if (!shouldCheckScope(element, *scopingNode, isInnerTreeScope))

continue;