third_party/WebKit/Source/core/css/resolver/ScopedStyleResolver.cpp - Issue 1575363006: Implement matching part of ::slotted() pseudo element

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 1575363006: Implement matching part of ::slotted() pseudo element (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@blink_slotted_parser

Patch Set: rebase Created 4 years, 11 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/SelectorFilter.cpp ('k') | third_party/WebKit/Source/core/css/resolver/SharedStyleFinder.cpp » ('j') | no next file with comments »
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 8cebdbfe462806bccfea4add451ebe48ec1292ff..1a2a83d382be54bee6fb46b8942ea4611664cb15 100644

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

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

@@ -207,7 +207,8 @@ static void addRules(RuleSet* ruleSet, const WillBeHeapVector<MinimalRuleData>&

void ScopedStyleResolver::addTreeBoundaryCrossingRules(const RuleSet& authorRules, CSSStyleSheet* parentStyleSheet, unsigned sheetIndex)

{

bool isDocumentScope = treeScope().rootNode().isDocumentNode();

- if (authorRules.deepCombinatorOrShadowPseudoRules().isEmpty() && (isDocumentScope || authorRules.shadowDistributedRules().isEmpty()))

+ if (authorRules.deepCombinatorOrShadowPseudoRules().isEmpty()

+ && (isDocumentScope || (authorRules.shadowDistributedRules().isEmpty() && authorRules.shadowSlottedRules().isEmpty())))

return;

if (!authorRules.deepCombinatorOrShadowPseudoRules().isEmpty())

@@ -216,8 +217,10 @@ void ScopedStyleResolver::addTreeBoundaryCrossingRules(const RuleSet& authorRule

OwnPtrWillBeRawPtr<RuleSet> ruleSetForScope = RuleSet::create();

addRules(ruleSetForScope.get(), authorRules.deepCombinatorOrShadowPseudoRules());

- if (!isDocumentScope)

+ if (!isDocumentScope) {

addRules(ruleSetForScope.get(), authorRules.shadowDistributedRules());

+ addRules(ruleSetForScope.get(), authorRules.shadowSlottedRules());

+ }

if (!m_treeBoundaryCrossingRuleSet) {

m_treeBoundaryCrossingRuleSet = adoptPtrWillBeNoop(new CSSStyleSheetRuleSubSet());