third_party/WebKit/Source/core/css/resolver/ScopedStyleResolver.cpp - Issue 1803933002: Use correct cascading order for Shadow DOM v1

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/ScopedStyleResolver.cpp

Issue 1803933002: Use correct cascading order for Shadow DOM v1 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix inline style Created 4 years, 9 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/LayoutTests/imported/web-platform-tests/shadow-dom/styles/shadow-cascade-order-expected.txt ('K') | « third_party/WebKit/Source/core/css/resolver/ScopedStyleResolver.h ('k') | third_party/WebKit/Source/core/css/resolver/StyleResolver.h » ('j') | third_party/WebKit/Source/core/css/resolver/StyleResolver.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 33cf98c2e322e903649f84df59445c8d4395f732..c40cc084a4fa8ada133566946e354430a3f1285f 100644

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

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

@@ -164,6 +164,9 @@ void ScopedStyleResolver::collectMatchingShadowHostRules(ElementRuleCollector& c

void ScopedStyleResolver::collectMatchingTreeBoundaryCrossingRules(ElementRuleCollector& collector, CascadeOrder cascadeOrder)

{

+ if (!m_treeBoundaryCrossingRuleSet)

+ return;

for (const auto& rules : *m_treeBoundaryCrossingRuleSet) {

MatchRequest request(rules->m_ruleSet.get(), &treeScope().rootNode(), rules->m_parentStyleSheet, rules->m_parentIndex);

collector.collectMatchingRules(request, cascadeOrder, true);