Changeset 142717 in webkit


Ignore:
Timestamp:
Feb 12, 2013 9:10:12 PM (11 years ago)
Author:
tasak@google.com
Message:

[Refactoring] Make SelectorChecker::mode a constructor parameter.
https://bugs.webkit.org/show_bug.cgi?id=109653

Reviewed by Dimitri Glazkov.

No new tests, because just refactoring.

  • css/SelectorChecker.cpp:

(WebCore::SelectorChecker::SelectorChecker):
Made mode a constructor parameter.

  • css/SelectorChecker.h:

Removed setMode.
(SelectorChecker):

  • css/StyleResolver.cpp:

(WebCore::StyleResolver::ruleMatches):
(WebCore::StyleResolver::checkRegionSelector):

  • dom/SelectorQuery.cpp:

(WebCore::SelectorQuery::matches):
(WebCore::SelectorQuery::queryAll):
(WebCore::SelectorQuery::queryFirst):

  • html/shadow/ContentSelectorQuery.cpp:

(WebCore::ContentSelectorChecker::ContentSelectorChecker):

Location:
trunk/Source/WebCore
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r142714 r142717  
     12013-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
    1262013-02-12  Andreas Kling  <akling@apple.com>
    227
  • trunk/Source/WebCore/css/SelectorChecker.cpp

    r142591 r142717  
    6363using namespace HTMLNames;
    6464
    65 SelectorChecker::SelectorChecker(Document* document)
     65SelectorChecker::SelectorChecker(Document* document, Mode mode)
    6666    : m_strictParsing(!document->inQuirksMode())
    6767    , m_documentIsHTML(document->isHTMLDocument())
    68     , m_mode(ResolvingStyle)
     68    , m_mode(mode)
    6969{
    7070}
  • trunk/Source/WebCore/css/SelectorChecker.h

    r142591 r142717  
    4545    WTF_MAKE_NONCOPYABLE(SelectorChecker);
    4646public:
    47     explicit SelectorChecker(Document*);
    48 
    4947    enum Match { SelectorMatches, SelectorFailsLocally, SelectorFailsAllSiblings, SelectorFailsCompletely };
    5048    enum VisitedMatchType { VisitedMatchDisabled, VisitedMatchEnabled };
    5149    enum Mode { ResolvingStyle = 0, CollectingRules, QueryingRules, SharingRules };
     50    explicit SelectorChecker(Document*, Mode);
    5251
    5352    struct SelectorCheckingContext {
     
    8887
    8988    Mode mode() const { return m_mode; }
    90     void setMode(Mode mode) { m_mode = mode; }
    9189
    9290    static bool tagMatches(const Element*, const QualifiedName&);
  • trunk/Source/WebCore/css/StyleResolver.cpp

    r142591 r142717  
    20782078
    20792079    // Slow path.
    2080     SelectorChecker selectorChecker(document());
    2081     selectorChecker.setMode(state.mode);
     2080    SelectorChecker selectorChecker(document(), state.mode);
    20822081    SelectorChecker::SelectorCheckingContext context(ruleData.selector(), state.element, SelectorChecker::VisitedMatchEnabled);
    20832082    context.elementStyle = state.style.get();
     
    20992098    m_state.pseudoStyle = NOPSEUDO;
    21002099
    2101     SelectorChecker selectorChecker(document());
     2100    SelectorChecker selectorChecker(document(), SelectorChecker::ResolvingStyle);
    21022101    for (const CSSSelector* s = regionSelector; s; s = CSSSelectorList::next(s))
    21032102        if (selectorChecker.matches(s, regionElement))
  • trunk/Source/WebCore/dom/SelectorQuery.cpp

    r140530 r142717  
    153153bool SelectorQuery::matches(Element* element) const
    154154{
    155     SelectorChecker selectorChecker(element->document());
     155    SelectorChecker selectorChecker(element->document(), SelectorChecker::ResolvingStyle);
    156156    return m_selectors.matches(selectorChecker, element);
    157157}
     
    159159PassRefPtr<NodeList> SelectorQuery::queryAll(Node* rootNode) const
    160160{
    161     SelectorChecker selectorChecker(rootNode->document());
    162     selectorChecker.setMode(SelectorChecker::QueryingRules);
     161    SelectorChecker selectorChecker(rootNode->document(), SelectorChecker::QueryingRules);
    163162    return m_selectors.queryAll(selectorChecker, rootNode);
    164163}
     
    166165PassRefPtr<Element> SelectorQuery::queryFirst(Node* rootNode) const
    167166{
    168     SelectorChecker selectorChecker(rootNode->document());
    169     selectorChecker.setMode(SelectorChecker::QueryingRules);
     167    SelectorChecker selectorChecker(rootNode->document(), SelectorChecker::QueryingRules);
    170168    return m_selectors.queryFirst(selectorChecker, rootNode);
    171169}
  • trunk/Source/WebCore/html/shadow/ContentSelectorQuery.cpp

    r140530 r142717  
    3737
    3838ContentSelectorChecker::ContentSelectorChecker(Document* document)
    39     : m_selectorChecker(document)
     39    : m_selectorChecker(document, SelectorChecker::CollectingRules)
    4040{
    41     m_selectorChecker.setMode(SelectorChecker::CollectingRules);
    4241}
    4342
Note: See TracChangeset for help on using the changeset viewer.