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

Side by Side Diff: Source/core/css/SelectorChecker.h

Issue 313303002: Change shadow style's scope from Shadow Host to Shadow Root (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fix merge failure Created 6 years, 6 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/core/css/ElementRuleCollector.cpp ('k') | Source/core/css/SelectorChecker.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com) 3 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com)
4 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com) 4 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com)
5 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved. 5 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved.
6 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> 6 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
7 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org> 7 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org>
8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) 8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)
9 * Copyright (c) 2011, Code Aurora Forum. All rights reserved. 9 * Copyright (c) 2011, Code Aurora Forum. All rights reserved.
10 * Copyright (C) Research In Motion Limited 2011. All rights reserved. 10 * Copyright (C) Research In Motion Limited 2011. All rights reserved.
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 enum Match { SelectorMatches, SelectorFailsLocally, SelectorFailsAllSiblings , SelectorFailsCompletely }; 46 enum Match { SelectorMatches, SelectorFailsLocally, SelectorFailsAllSiblings , SelectorFailsCompletely };
47 enum VisitedMatchType { VisitedMatchDisabled, VisitedMatchEnabled }; 47 enum VisitedMatchType { VisitedMatchDisabled, VisitedMatchEnabled };
48 enum Mode { ResolvingStyle = 0, CollectingStyleRules, CollectingCSSRules, Qu eryingRules, SharingRules }; 48 enum Mode { ResolvingStyle = 0, CollectingStyleRules, CollectingCSSRules, Qu eryingRules, SharingRules };
49 explicit SelectorChecker(Document&, Mode); 49 explicit SelectorChecker(Document&, Mode);
50 enum BehaviorAtBoundary { 50 enum BehaviorAtBoundary {
51 DoesNotCrossBoundary = 0, 51 DoesNotCrossBoundary = 0,
52 // FIXME: refactor to remove BoundaryBehavior (i.e. DoesNotCrossBoundary and StaysWithinTreeScope). 52 // FIXME: refactor to remove BoundaryBehavior (i.e. DoesNotCrossBoundary and StaysWithinTreeScope).
53 StaysWithinTreeScope = 2, 53 StaysWithinTreeScope = 2,
54 BoundaryBehaviorMask = 3, // 2bit for boundary behavior 54 BoundaryBehaviorMask = 3, // 2bit for boundary behavior
55 ScopeContainsLastMatchedElement = 4, 55 ScopeContainsLastMatchedElement = 4,
56 ScopeIsShadowHost = 8, 56 ScopeIsShadowRoot = 8,
57 TreatShadowHostAsNormalScope = 16, 57 TreatShadowHostAsNormalScope = 16,
58 58
59 ScopeIsShadowHostInPseudoHostParameter = ScopeIsShadowHost | TreatShadow HostAsNormalScope 59 ScopeIsShadowHostInPseudoHostParameter = ScopeIsShadowRoot | TreatShadow HostAsNormalScope
60 }; 60 };
61 61
62 struct SelectorCheckingContext { 62 struct SelectorCheckingContext {
63 // Initial selector constructor 63 // Initial selector constructor
64 SelectorCheckingContext(const CSSSelector& selector, Element* element, V isitedMatchType visitedMatchType) 64 SelectorCheckingContext(const CSSSelector& selector, Element* element, V isitedMatchType visitedMatchType)
65 : selector(&selector) 65 : selector(&selector)
66 , element(element) 66 , element(element)
67 , previousElement(0) 67 , previousElement(0)
68 , scope(0) 68 , scope(0)
69 , visitedMatchType(visitedMatchType) 69 , visitedMatchType(visitedMatchType)
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
172 AttributeConstIterator end = attributes.end(); 172 AttributeConstIterator end = attributes.end();
173 for (AttributeConstIterator it = attributes.begin(); it != end; ++it) { 173 for (AttributeConstIterator it = attributes.begin(); it != end; ++it) {
174 if (it->matches(selectorAttributeName) && (!value || it->value().impl() == value)) 174 if (it->matches(selectorAttributeName) && (!value || it->value().impl() == value))
175 return true; 175 return true;
176 } 176 }
177 return false; 177 return false;
178 } 178 }
179 179
180 inline bool SelectorChecker::isHostInItsShadowTree(const Element& element, Behav iorAtBoundary behaviorAtBoundary, const ContainerNode* scope) 180 inline bool SelectorChecker::isHostInItsShadowTree(const Element& element, Behav iorAtBoundary behaviorAtBoundary, const ContainerNode* scope)
181 { 181 {
182 if ((behaviorAtBoundary & (ScopeIsShadowHost | TreatShadowHostAsNormalScope) ) == ScopeIsShadowHost) 182 return scope && scope->isInShadowTree() && scope->shadowHost() == element;
183 return scope == element;
184 if (scope && scope->isInShadowTree())
185 return scope->shadowHost() == element;
186 return false;
187 } 183 }
188 184
189 } 185 }
190 186
191 #endif 187 #endif
OLDNEW
« no previous file with comments | « Source/core/css/ElementRuleCollector.cpp ('k') | Source/core/css/SelectorChecker.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698