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

Unified Diff: Source/core/css/SelectorChecker.cpp

Issue 205563004: Revert of Implement /content/ combinator. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fixed patch conflict Created 6 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
« no previous file with comments | « Source/core/css/RuleSetTest.cpp ('k') | Source/core/css/SelectorFilter.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/css/SelectorChecker.cpp
diff --git a/Source/core/css/SelectorChecker.cpp b/Source/core/css/SelectorChecker.cpp
index c419e53146dacc0e6810f6a3b43da62f076efa29..36d9f5f8c2ddee0301070505f5bd4d84b48fe9e4 100644
--- a/Source/core/css/SelectorChecker.cpp
+++ b/Source/core/css/SelectorChecker.cpp
@@ -151,6 +151,9 @@ SelectorChecker::Match SelectorChecker::match(const SelectorCheckingContext& con
if (context.selector->isCustomPseudoElement()) {
if (!matchesCustomPseudoElement(context.element, *context.selector))
return SelectorFailsLocally;
+ } else if (context.selector->isContentPseudoElement()) {
+ if (!context.element->isInShadowTree() || !context.element->isInsertionPoint())
+ return SelectorFailsLocally;
} else {
if ((!context.elementStyle && m_mode == ResolvingStyle) || m_mode == QueryingRules)
return SelectorFailsLocally;
@@ -273,10 +276,6 @@ SelectorChecker::Match SelectorChecker::matchForRelation(const SelectorCheckingC
nextContext.elementStyle = 0;
return match(nextContext, siblingTraversalStrategy, result);
}
-
- case CSSSelector::ShadowContent:
- return matchForShadowDistributed(context.element, siblingTraversalStrategy, nextContext, result);
-
case CSSSelector::DirectAdjacent:
if (m_mode == ResolvingStyle) {
if (ContainerNode* parent = context.element->parentElementOrShadowRoot())
« no previous file with comments | « Source/core/css/RuleSetTest.cpp ('k') | Source/core/css/SelectorFilter.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698