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

Side by Side Diff: Source/core/css/SelectorFilter.cpp

Issue 15657003: Make a '::distributed' pseudo element the first-ever client who can accept a relative selector. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Introduce m_relationIsForShadowDistributed Created 7 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/core/css/SelectorChecker.cpp ('k') | no next file » | 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 Apple Inc. All rights reserved. 5 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011 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 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 default: 128 default:
129 break; 129 break;
130 } 130 }
131 } 131 }
132 132
133 void SelectorFilter::collectIdentifierHashes(const CSSSelector* selector, unsign ed* identifierHashes, unsigned maximumIdentifierCount) 133 void SelectorFilter::collectIdentifierHashes(const CSSSelector* selector, unsign ed* identifierHashes, unsigned maximumIdentifierCount)
134 { 134 {
135 unsigned* hash = identifierHashes; 135 unsigned* hash = identifierHashes;
136 unsigned* end = identifierHashes + maximumIdentifierCount; 136 unsigned* end = identifierHashes + maximumIdentifierCount;
137 CSSSelector::Relation relation = selector->relation(); 137 CSSSelector::Relation relation = selector->relation();
138 bool relationIsForShadowDistributed = selector->relationIsForShadowDistribut ed();
138 139
139 // Skip the topmost selector. It is handled quickly by the rule hashes. 140 // Skip the topmost selector. It is handled quickly by the rule hashes.
140 bool skipOverSubselectors = true; 141 bool skipOverSubselectors = true;
141 for (selector = selector->tagHistory(); selector; selector = selector->tagHi story()) { 142 for (selector = selector->tagHistory(); selector; selector = selector->tagHi story()) {
142 // Only collect identifiers that match ancestors. 143 // Only collect identifiers that match ancestors.
143 switch (relation) { 144 switch (relation) {
144 case CSSSelector::SubSelector: 145 case CSSSelector::SubSelector:
145 if (!skipOverSubselectors) 146 if (!skipOverSubselectors)
146 collectDescendantSelectorIdentifierHashes(selector, hash); 147 collectDescendantSelectorIdentifierHashes(selector, hash);
147 break; 148 break;
148 case CSSSelector::DirectAdjacent: 149 case CSSSelector::DirectAdjacent:
149 case CSSSelector::IndirectAdjacent: 150 case CSSSelector::IndirectAdjacent:
150 case CSSSelector::ShadowPseudo: 151 case CSSSelector::ShadowPseudo:
151 case CSSSelector::ShadowDistributed:
152 skipOverSubselectors = true; 152 skipOverSubselectors = true;
153 break; 153 break;
154 case CSSSelector::Descendant: 154 case CSSSelector::Descendant:
155 case CSSSelector::Child: 155 case CSSSelector::Child:
156 if (relationIsForShadowDistributed) {
157 skipOverSubselectors = true;
158 break;
159 }
156 skipOverSubselectors = false; 160 skipOverSubselectors = false;
157 collectDescendantSelectorIdentifierHashes(selector, hash); 161 collectDescendantSelectorIdentifierHashes(selector, hash);
158 break; 162 break;
159 } 163 }
160 if (hash == end) 164 if (hash == end)
161 return; 165 return;
162 relation = selector->relation(); 166 relation = selector->relation();
167 relationIsForShadowDistributed = selector->relationIsForShadowDistribute d();
163 } 168 }
164 *hash = 0; 169 *hash = 0;
165 } 170 }
166 171
167 } 172 }
OLDNEW
« no previous file with comments | « Source/core/css/SelectorChecker.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698