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

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

Issue 1082023003: Allow "::content /deep/" to match. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 8 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 | « LayoutTests/fast/dom/shadow/content-deep-expected.txt ('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, 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 332 matching lines...) Expand 10 before | Expand all | Expand 10 after
343 if (!shadowHost) 343 if (!shadowHost)
344 return SelectorFailsCompletely; 344 return SelectorFailsCompletely;
345 nextContext.element = shadowHost; 345 nextContext.element = shadowHost;
346 nextContext.isSubSelector = false; 346 nextContext.isSubSelector = false;
347 nextContext.elementStyle = 0; 347 nextContext.elementStyle = 0;
348 return this->match(nextContext, siblingTraversalStrategy, result); 348 return this->match(nextContext, siblingTraversalStrategy, result);
349 } 349 }
350 350
351 case CSSSelector::ShadowDeep: 351 case CSSSelector::ShadowDeep:
352 { 352 {
353 if (context.selector->relationIsAffectedByPseudoContent()) {
354 for (Element* element = context.element; element; element = pare ntOrShadowHostButDisallowEscapingClosedShadowTree(*element)) {
355 if (matchForShadowDistributed(element, siblingTraversalStrat egy, nextContext, result) == SelectorMatches)
356 return SelectorMatches;
357 }
358 return SelectorFailsCompletely;
359 }
360
353 nextContext.isSubSelector = false; 361 nextContext.isSubSelector = false;
354 nextContext.elementStyle = 0; 362 nextContext.elementStyle = 0;
355 for (nextContext.element = parentOrShadowHostButDisallowEscapingClos edShadowTree(*context.element); nextContext.element; nextContext.element = paren tOrShadowHostButDisallowEscapingClosedShadowTree(*nextContext.element)) { 363 for (nextContext.element = parentOrShadowHostButDisallowEscapingClos edShadowTree(*context.element); nextContext.element; nextContext.element = paren tOrShadowHostButDisallowEscapingClosedShadowTree(*nextContext.element)) {
356 Match match = this->match(nextContext, siblingTraversalStrategy, result); 364 Match match = this->match(nextContext, siblingTraversalStrategy, result);
357 if (match == SelectorMatches || match == SelectorFailsCompletely ) 365 if (match == SelectorMatches || match == SelectorFailsCompletely )
358 return match; 366 return match;
359 if (nextSelectorExceedsScope(nextContext)) 367 if (nextSelectorExceedsScope(nextContext))
360 return SelectorFailsCompletely; 368 return SelectorFailsCompletely;
361 } 369 }
362 return SelectorFailsCompletely; 370 return SelectorFailsCompletely;
(...skipping 830 matching lines...) Expand 10 before | Expand all | Expand 10 after
1193 return isHTMLSelectElement(element) && !toHTMLSelectElement(element).usesMen uList(); 1201 return isHTMLSelectElement(element) && !toHTMLSelectElement(element).usesMen uList();
1194 } 1202 }
1195 1203
1196 template 1204 template
1197 SelectorChecker::Match SelectorChecker::match(const SelectorCheckingContext&, co nst DOMSiblingTraversalStrategy&, MatchResult*) const; 1205 SelectorChecker::Match SelectorChecker::match(const SelectorCheckingContext&, co nst DOMSiblingTraversalStrategy&, MatchResult*) const;
1198 1206
1199 template 1207 template
1200 SelectorChecker::Match SelectorChecker::match(const SelectorCheckingContext&, co nst ShadowDOMSiblingTraversalStrategy&, MatchResult*) const; 1208 SelectorChecker::Match SelectorChecker::match(const SelectorCheckingContext&, co nst ShadowDOMSiblingTraversalStrategy&, MatchResult*) const;
1201 1209
1202 } 1210 }
OLDNEW
« no previous file with comments | « LayoutTests/fast/dom/shadow/content-deep-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698