Changeset 143150 in webkit

Timestamp:

Feb 17, 2013 10:37:10 PM (11 years ago)

Author:

Dimitri Glazkov

Message:

Stop passing around SelectorChecker in ContentSelectorQuery.
​https://bugs.webkit.org/show_bug.cgi?id=110041

Now that SelectorChecker has no interesting state, we can simplify ContentSelectorQuery and get rid of a class.

Reviewed by Andreas Kling.

No functional changes, covered by existing tests.

• html/shadow/ContentSelectorQuery.cpp:

(WebCore::ContentSelectorDataList::checkContentSelector): Zapped ContentSelectorChecker and moved its only remaining method here.
(WebCore::ContentSelectorDataList::matches): Removed SelectorChecker argument.
(WebCore::ContentSelectorQuery::ContentSelectorQuery): Removed an unnecessary member.
(WebCore::ContentSelectorQuery::matches): Removed unnecessary argument.

• html/shadow/ContentSelectorQuery.h:

(WebCore): Cleaned up the file.
(ContentSelectorDataList): Updated decls.
(ContentSelectorQuery): Ditto.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/shadow/ContentSelectorQuery.cpp (modified) (4 diffs)
• html/shadow/ContentSelectorQuery.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-02-17  Dimitri Glazkov  <dglazkov@chromium.org>
+
+        Stop passing around SelectorChecker in ContentSelectorQuery.
+        https://bugs.webkit.org/show_bug.cgi?id=110041
+
+        Now that SelectorChecker has no interesting state, we can simplify ContentSelectorQuery and get rid of a class.
+
+        Reviewed by Andreas Kling.
+
+        No functional changes, covered by existing tests.
+
+        * html/shadow/ContentSelectorQuery.cpp:
+        (WebCore::ContentSelectorDataList::checkContentSelector): Zapped ContentSelectorChecker and moved its only remaining method here.
+        (WebCore::ContentSelectorDataList::matches): Removed SelectorChecker argument.
+        (WebCore::ContentSelectorQuery::ContentSelectorQuery): Removed an unnecessary member.
+        (WebCore::ContentSelectorQuery::matches): Removed unnecessary argument.
+        * html/shadow/ContentSelectorQuery.h:
+        (WebCore): Cleaned up the file.
+        (ContentSelectorDataList): Updated decls.
+        (ContentSelectorQuery): Ditto.
+
 2013-02-17  Mike West  <mkwst@chromium.org>
 

trunk/Source/WebCore/html/shadow/ContentSelectorQuery.cpp

@@ -36 +36 @@
 namespace WebCore {
 
-ContentSelectorChecker::ContentSelectorChecker(Document* document)
-    : m_selectorChecker(document, SelectorChecker::CollectingRules)
+bool ContentSelectorDataList::checkContentSelector(const CSSSelector* selector, const Vector<RefPtr<Node> >& siblings, int nth)
 {
-}
-
-bool ContentSelectorChecker::checkContentSelector(const CSSSelector* selector, const Vector<RefPtr<Node> >& siblings, int nth) const
-{
-    SelectorChecker::SelectorCheckingContext context(selector, toElement(siblings[nth].get()), SelectorChecker::VisitedMatchEnabled);
+    Element* element = toElement(siblings[nth].get());
+    SelectorChecker selectorChecker(element->document(), SelectorChecker::CollectingRules);
+    SelectorChecker::SelectorCheckingContext context(selector, element, SelectorChecker::VisitedMatchEnabled);
     ShadowDOMSiblingTraversalStrategy strategy(siblings, nth);
     PseudoId ignoreDynamicPseudo = NOPSEUDO;
-    return m_selectorChecker.match(context, ignoreDynamicPseudo, strategy) == SelectorChecker::SelectorMatches;
+    return selectorChecker.match(context, ignoreDynamicPseudo, strategy) == SelectorChecker::SelectorMatches;
 }
 
@@ -55 +52 @@
 }
 
-bool ContentSelectorDataList::matches(const ContentSelectorChecker& selectorChecker, const Vector<RefPtr<Node> >& siblings, int nth) const
+bool ContentSelectorDataList::matches(const Vector<RefPtr<Node> >& siblings, int nth) const
 {
     unsigned selectorCount = m_selectors.size();
     for (unsigned i = 0; i < selectorCount; ++i) {
-        if (selectorChecker.checkContentSelector(m_selectors[i], siblings, nth))
+        if (checkContentSelector(m_selectors[i], siblings, nth))
             return true;
     }
@@ -67 +64 @@
 ContentSelectorQuery::ContentSelectorQuery(InsertionPoint* insertionPoint)
     : m_insertionPoint(insertionPoint)
-    , m_selectorChecker(insertionPoint->document())
 {
     m_selectors.initialize(insertionPoint->selectorList());
@@ -83 +79 @@
         return false;
     case InsertionPoint::HasToMatchSelector:
-        return node->isElementNode() && m_selectors.matches(m_selectorChecker, siblings, nth);
+        return node->isElementNode() && m_selectors.matches(siblings, nth);
     default:
         ASSERT_NOT_REACHED();

trunk/Source/WebCore/html/shadow/ContentSelectorQuery.h

@@ -44 +44 @@
 class InsertionPoint;
 
-class ContentSelectorChecker {
-public:
-    ContentSelectorChecker(Document*);
-
-    bool checkContentSelector(const CSSSelector*, const Vector<RefPtr<Node> >& siblings, int nthNode) const;
-private:
-    SelectorChecker m_selectorChecker;
-};
-
 class ContentSelectorDataList {
 public:
     void initialize(const CSSSelectorList&);
-    bool matches(const ContentSelectorChecker&, const Vector<RefPtr<Node> >& siblings, int nthNode) const;
+    bool matches(const Vector<RefPtr<Node> >& siblings, int nthNode) const;
 
 private:
+    static bool checkContentSelector(const CSSSelector*, const Vector<RefPtr<Node> >& siblings, int nthNode);
+
     Vector<const CSSSelector*> m_selectors;
 };
@@ -68 +61 @@
 
     bool matches(const Vector<RefPtr<Node> >& siblings, int nthNode) const;
+
 private:
-
     InsertionPoint* m_insertionPoint;
     ContentSelectorDataList m_selectors;
-    ContentSelectorChecker m_selectorChecker;
 };