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

Side by Side Diff: Source/core/dom/SelectorQuery.cpp

Issue 26218002: ClassRootNodeList should start from rootNode, not the first child of rootNode. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Patch for landing Created 7 years, 2 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/selectors/querySelector-leftmost-selector-matches-rootNode-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) 2011 Apple Inc. All rights reserved. 2 * Copyright (C) 2011 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 m_currentNode = 0; 57 m_currentNode = 0;
58 return current; 58 return current;
59 } 59 }
60 60
61 private: 61 private:
62 Node* m_currentNode; 62 Node* m_currentNode;
63 }; 63 };
64 64
65 class ClassRootNodeList : public SimpleNodeList { 65 class ClassRootNodeList : public SimpleNodeList {
66 public: 66 public:
67 explicit ClassRootNodeList(Node* rootNode, const AtomicString& className) 67 ClassRootNodeList(Node* rootNode, const AtomicString& className)
68 : m_className(className) 68 : m_className(className)
69 , m_rootNode(rootNode) 69 , m_rootNode(rootNode)
70 , m_currentElement(nextInternal(ElementTraversal::firstWithin(rootNode)) ) { } 70 , m_currentElement(nextInternal(rootNode && rootNode->isElementNode() ? toElement(rootNode) : ElementTraversal::firstWithin(rootNode))) { }
71 71
72 bool isEmpty() const { return !m_currentElement; } 72 bool isEmpty() const { return !m_currentElement; }
73 73
74 Node* next() 74 Node* next()
75 { 75 {
76 Node* current = m_currentElement; 76 Node* current = m_currentElement;
77 ASSERT(current); 77 ASSERT(current);
78 m_currentElement = nextInternal(ElementTraversal::nextSkippingChildren(m _currentElement, m_rootNode)); 78 m_currentElement = nextInternal(ElementTraversal::nextSkippingChildren(m _currentElement, m_rootNode));
79 return current; 79 return current;
80 } 80 }
81 81
82 private: 82 private:
83 Element* nextInternal(Element* element) 83 Element* nextInternal(Element* element)
84 { 84 {
85 for (; element; element = ElementTraversal::next(element, m_rootNode)) { 85 for (; element; element = ElementTraversal::next(element, m_rootNode)) {
86 if (element->hasClass() && element->classNames().contains(m_classNam e)) 86 if (element->hasClass() && element->classNames().contains(m_classNam e))
87 return element; 87 return element;
88 } 88 }
89 return 0; 89 return 0;
90 } 90 }
91 91
92 const AtomicString& m_className; 92 const AtomicString& m_className;
93 Node* m_rootNode; 93 Node* m_rootNode;
94 Element* m_currentElement; 94 Element* m_currentElement;
95 }; 95 };
96 96
97 class ClassElementList : public SimpleNodeList { 97 class ClassElementList : public SimpleNodeList {
98 public: 98 public:
99 explicit ClassElementList(Node* rootNode, const AtomicString& className) 99 ClassElementList(Node* rootNode, const AtomicString& className)
100 : m_className(className) 100 : m_className(className)
101 , m_rootNode(rootNode) 101 , m_rootNode(rootNode)
102 , m_currentElement(nextInternal(ElementTraversal::firstWithin(rootNode)) ) { } 102 , m_currentElement(nextInternal(ElementTraversal::firstWithin(rootNode)) ) { }
103 103
104 bool isEmpty() const { return !m_currentElement; } 104 bool isEmpty() const { return !m_currentElement; }
105 105
106 Node* next() 106 Node* next()
107 { 107 {
108 Node* current = m_currentElement; 108 Node* current = m_currentElement;
109 ASSERT(current); 109 ASSERT(current);
(...skipping 400 matching lines...) Expand 10 before | Expand all | Expand 10 after
510 m_entries.add(selectors, selectorQuery.release()); 510 m_entries.add(selectors, selectorQuery.release());
511 return rawSelectorQuery; 511 return rawSelectorQuery;
512 } 512 }
513 513
514 void SelectorQueryCache::invalidate() 514 void SelectorQueryCache::invalidate()
515 { 515 {
516 m_entries.clear(); 516 m_entries.clear();
517 } 517 }
518 518
519 } 519 }
OLDNEW
« no previous file with comments | « LayoutTests/fast/selectors/querySelector-leftmost-selector-matches-rootNode-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698