Changeset 142717 in webkit
- Timestamp:
- Feb 12, 2013 9:10:12 PM (11 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r142714 r142717 1 2013-02-12 Takashi Sakamoto <tasak@google.com> 2 3 [Refactoring] Make SelectorChecker::mode a constructor parameter. 4 https://bugs.webkit.org/show_bug.cgi?id=109653 5 6 Reviewed by Dimitri Glazkov. 7 8 No new tests, because just refactoring. 9 10 * css/SelectorChecker.cpp: 11 (WebCore::SelectorChecker::SelectorChecker): 12 Made mode a constructor parameter. 13 * css/SelectorChecker.h: 14 Removed setMode. 15 (SelectorChecker): 16 * css/StyleResolver.cpp: 17 (WebCore::StyleResolver::ruleMatches): 18 (WebCore::StyleResolver::checkRegionSelector): 19 * dom/SelectorQuery.cpp: 20 (WebCore::SelectorQuery::matches): 21 (WebCore::SelectorQuery::queryAll): 22 (WebCore::SelectorQuery::queryFirst): 23 * html/shadow/ContentSelectorQuery.cpp: 24 (WebCore::ContentSelectorChecker::ContentSelectorChecker): 25 1 26 2013-02-12 Andreas Kling <akling@apple.com> 2 27 -
trunk/Source/WebCore/css/SelectorChecker.cpp
r142591 r142717 63 63 using namespace HTMLNames; 64 64 65 SelectorChecker::SelectorChecker(Document* document )65 SelectorChecker::SelectorChecker(Document* document, Mode mode) 66 66 : m_strictParsing(!document->inQuirksMode()) 67 67 , m_documentIsHTML(document->isHTMLDocument()) 68 , m_mode( ResolvingStyle)68 , m_mode(mode) 69 69 { 70 70 } -
trunk/Source/WebCore/css/SelectorChecker.h
r142591 r142717 45 45 WTF_MAKE_NONCOPYABLE(SelectorChecker); 46 46 public: 47 explicit SelectorChecker(Document*);48 49 47 enum Match { SelectorMatches, SelectorFailsLocally, SelectorFailsAllSiblings, SelectorFailsCompletely }; 50 48 enum VisitedMatchType { VisitedMatchDisabled, VisitedMatchEnabled }; 51 49 enum Mode { ResolvingStyle = 0, CollectingRules, QueryingRules, SharingRules }; 50 explicit SelectorChecker(Document*, Mode); 52 51 53 52 struct SelectorCheckingContext { … … 88 87 89 88 Mode mode() const { return m_mode; } 90 void setMode(Mode mode) { m_mode = mode; }91 89 92 90 static bool tagMatches(const Element*, const QualifiedName&); -
trunk/Source/WebCore/css/StyleResolver.cpp
r142591 r142717 2078 2078 2079 2079 // Slow path. 2080 SelectorChecker selectorChecker(document()); 2081 selectorChecker.setMode(state.mode); 2080 SelectorChecker selectorChecker(document(), state.mode); 2082 2081 SelectorChecker::SelectorCheckingContext context(ruleData.selector(), state.element, SelectorChecker::VisitedMatchEnabled); 2083 2082 context.elementStyle = state.style.get(); … … 2099 2098 m_state.pseudoStyle = NOPSEUDO; 2100 2099 2101 SelectorChecker selectorChecker(document() );2100 SelectorChecker selectorChecker(document(), SelectorChecker::ResolvingStyle); 2102 2101 for (const CSSSelector* s = regionSelector; s; s = CSSSelectorList::next(s)) 2103 2102 if (selectorChecker.matches(s, regionElement)) -
trunk/Source/WebCore/dom/SelectorQuery.cpp
r140530 r142717 153 153 bool SelectorQuery::matches(Element* element) const 154 154 { 155 SelectorChecker selectorChecker(element->document() );155 SelectorChecker selectorChecker(element->document(), SelectorChecker::ResolvingStyle); 156 156 return m_selectors.matches(selectorChecker, element); 157 157 } … … 159 159 PassRefPtr<NodeList> SelectorQuery::queryAll(Node* rootNode) const 160 160 { 161 SelectorChecker selectorChecker(rootNode->document()); 162 selectorChecker.setMode(SelectorChecker::QueryingRules); 161 SelectorChecker selectorChecker(rootNode->document(), SelectorChecker::QueryingRules); 163 162 return m_selectors.queryAll(selectorChecker, rootNode); 164 163 } … … 166 165 PassRefPtr<Element> SelectorQuery::queryFirst(Node* rootNode) const 167 166 { 168 SelectorChecker selectorChecker(rootNode->document()); 169 selectorChecker.setMode(SelectorChecker::QueryingRules); 167 SelectorChecker selectorChecker(rootNode->document(), SelectorChecker::QueryingRules); 170 168 return m_selectors.queryFirst(selectorChecker, rootNode); 171 169 } -
trunk/Source/WebCore/html/shadow/ContentSelectorQuery.cpp
r140530 r142717 37 37 38 38 ContentSelectorChecker::ContentSelectorChecker(Document* document) 39 : m_selectorChecker(document )39 : m_selectorChecker(document, SelectorChecker::CollectingRules) 40 40 { 41 m_selectorChecker.setMode(SelectorChecker::CollectingRules);42 41 } 43 42
Note: See TracChangeset
for help on using the changeset viewer.