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

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

Issue 436603003: Make Element::attributes() less error-prone and simplify call sites (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Take feedback into consideration Created 6 years, 4 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.h ('k') | Source/core/dom/AttributeCollection.h » ('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 445 matching lines...) Expand 10 before | Expand all | Expand 10 after
456 456
457 static bool anyAttributeMatches(Element& element, CSSSelector::Match match, cons t CSSSelector& selector) 457 static bool anyAttributeMatches(Element& element, CSSSelector::Match match, cons t CSSSelector& selector)
458 { 458 {
459 const QualifiedName& selectorAttr = selector.attribute(); 459 const QualifiedName& selectorAttr = selector.attribute();
460 ASSERT(selectorAttr.localName() != starAtom); // Should not be possible from the CSS grammar. 460 ASSERT(selectorAttr.localName() != starAtom); // Should not be possible from the CSS grammar.
461 461
462 // Synchronize the attribute in case it is lazy-computed. 462 // Synchronize the attribute in case it is lazy-computed.
463 // Currently all lazy properties have a null namespace, so only pass localNa me(). 463 // Currently all lazy properties have a null namespace, so only pass localNa me().
464 element.synchronizeAttribute(selectorAttr.localName()); 464 element.synchronizeAttribute(selectorAttr.localName());
465 465
466 if (!element.hasAttributesWithoutUpdate())
467 return false;
468
469 const AtomicString& selectorValue = selector.value(); 466 const AtomicString& selectorValue = selector.value();
470 bool caseInsensitive = selector.attributeMatchType() == CSSSelector::CaseIns ensitive; 467 bool caseInsensitive = selector.attributeMatchType() == CSSSelector::CaseIns ensitive;
471 468
472 AttributeCollection attributes = element.attributes(); 469 AttributeCollection attributes = element.attributesWithoutUpdate();
473 AttributeCollection::const_iterator end = attributes.end(); 470 AttributeCollection::const_iterator end = attributes.end();
474 for (AttributeCollection::const_iterator it = attributes.begin(); it != end; ++it) { 471 for (AttributeCollection::const_iterator it = attributes.begin(); it != end; ++it) {
475 const Attribute& attributeItem = *it; 472 const Attribute& attributeItem = *it;
476 473
477 if (!attributeItem.matches(selectorAttr)) 474 if (!attributeItem.matches(selectorAttr))
478 continue; 475 continue;
479 476
480 if (attributeValueMatches(attributeItem, match, selectorValue, !caseInse nsitive)) 477 if (attributeValueMatches(attributeItem, match, selectorValue, !caseInse nsitive))
481 return true; 478 return true;
482 479
(...skipping 649 matching lines...) Expand 10 before | Expand all | Expand 10 after
1132 return isHTMLOptionElement(element) && toHTMLOptionElement(element).spatialN avigationFocused() && isFrameFocused(element); 1129 return isHTMLOptionElement(element) && toHTMLOptionElement(element).spatialN avigationFocused() && isFrameFocused(element);
1133 } 1130 }
1134 1131
1135 template 1132 template
1136 SelectorChecker::Match SelectorChecker::match(const SelectorCheckingContext&, co nst DOMSiblingTraversalStrategy&, MatchResult*) const; 1133 SelectorChecker::Match SelectorChecker::match(const SelectorCheckingContext&, co nst DOMSiblingTraversalStrategy&, MatchResult*) const;
1137 1134
1138 template 1135 template
1139 SelectorChecker::Match SelectorChecker::match(const SelectorCheckingContext&, co nst ShadowDOMSiblingTraversalStrategy&, MatchResult*) const; 1136 SelectorChecker::Match SelectorChecker::match(const SelectorCheckingContext&, co nst ShadowDOMSiblingTraversalStrategy&, MatchResult*) const;
1140 1137
1141 } 1138 }
OLDNEW
« no previous file with comments | « Source/core/css/SelectorChecker.h ('k') | Source/core/dom/AttributeCollection.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698