Changeset 143152 in webkit

Timestamp:

Feb 17, 2013, 10:44:13 PM (12 years ago)

Author:

Dimitri Glazkov

Message:

Stop passing around SelectorChecker in SelectorQuery, now that it's stack-allocated.
​https://bugs.webkit.org/show_bug.cgi?id=110038

Reviewed by Andreas Kling.

No functional changes, covered by existing tests.

• dom/SelectorQuery.cpp:

(WebCore::SelectorDataList::matches): Moved instantiation of SelectorChecker in here.
(WebCore::SelectorDataList::queryAll): Got rid of unneeded SelectorChecker arg.
(WebCore::SelectorDataList::queryFirst): Ditto.
(WebCore::SelectorDataList::execute): Moved instantiation of SelectorChecker in here.
(WebCore::SelectorQuery::matches): Removed instantiation of SelectorChecker here.
(WebCore::SelectorQuery::queryAll): Ditto.
(WebCore::SelectorQuery::queryFirst): Ditto.

• dom/SelectorQuery.h:

(WebCore): Tweaked headers to make SelectorChecker just an implementation detail.
(SelectorDataList): Tweaked decls to remove SelectorChecker args.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/SelectorQuery.cpp (modified) (5 diffs)
• dom/SelectorQuery.h (modified) (4 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-02-17  Dimitri Glazkov  <dglazkov@chromium.org>
+
+        Stop passing around SelectorChecker in SelectorQuery, now that it's stack-allocated.
+        https://bugs.webkit.org/show_bug.cgi?id=110038
+
+        Reviewed by Andreas Kling.
+
+        No functional changes, covered by existing tests.
+
+        * dom/SelectorQuery.cpp:
+        (WebCore::SelectorDataList::matches): Moved instantiation of SelectorChecker in here.
+        (WebCore::SelectorDataList::queryAll): Got rid of unneeded SelectorChecker arg.
+        (WebCore::SelectorDataList::queryFirst): Ditto.
+        (WebCore::SelectorDataList::execute): Moved instantiation of SelectorChecker in here.
+        (WebCore::SelectorQuery::matches): Removed instantiation of SelectorChecker here.
+        (WebCore::SelectorQuery::queryAll): Ditto.
+        (WebCore::SelectorQuery::queryFirst): Ditto.
+        * dom/SelectorQuery.h:
+        (WebCore): Tweaked headers to make SelectorChecker just an implementation detail.
+        (SelectorDataList): Tweaked decls to remove SelectorChecker args.
+
 2013-02-17  Dimitri Glazkov  <dglazkov@chromium.org>
 

trunk/Source/WebCore/dom/SelectorQuery.cpp

@@ -30 +30 @@
 #include "CSSSelectorList.h"
 #include "Document.h"
+#include "SelectorChecker.h"
 #include "StaticNodeList.h"
 #include "StyledElement.h"
-#include <wtf/HashMap.h>
 
 namespace WebCore {
@@ -49 +49 @@
 }
 
-bool SelectorDataList::matches(const SelectorChecker& selectorChecker, Element* targetElement) const
+bool SelectorDataList::matches(Element* targetElement) const
 {
     ASSERT(targetElement);
 
+    SelectorChecker selectorChecker(targetElement->document(), SelectorChecker::ResolvingStyle);
     unsigned selectorCount = m_selectors.size();
     for (unsigned i = 0; i < selectorCount; ++i) {
@@ -62 +63 @@
 }
 
-PassRefPtr<NodeList> SelectorDataList::queryAll(const SelectorChecker& selectorChecker, Node* rootNode) const
+PassRefPtr<NodeList> SelectorDataList::queryAll(Node* rootNode) const
 {
     Vector<RefPtr<Node> > result;
-    execute<false>(selectorChecker, rootNode, result);
+    execute<false>(rootNode, result);
     return StaticNodeList::adopt(result);
 }
 
-PassRefPtr<Element> SelectorDataList::queryFirst(const SelectorChecker& selectorChecker, Node* rootNode) const
+PassRefPtr<Element> SelectorDataList::queryFirst(Node* rootNode) const
 {
     Vector<RefPtr<Node> > result;
-    execute<true>(selectorChecker, rootNode, result);
+    execute<true>(rootNode, result);
     if (result.isEmpty())
         return 0;
@@ -104 +105 @@
 
 template <bool firstMatchOnly>
-void SelectorDataList::execute(const SelectorChecker& selectorChecker, Node* rootNode, Vector<RefPtr<Node> >& matchedElements) const
-{
+void SelectorDataList::execute(Node* rootNode, Vector<RefPtr<Node> >& matchedElements) const
+{
+    SelectorChecker selectorChecker(rootNode->document(), SelectorChecker::QueryingRules);
+
     if (canUseIdLookup(rootNode)) {
         ASSERT(m_selectors.size() == 1);
@@ -153 +156 @@
 bool SelectorQuery::matches(Element* element) const
 {
-    SelectorChecker selectorChecker(element->document(), SelectorChecker::ResolvingStyle);
-    return m_selectors.matches(selectorChecker, element);
+    return m_selectors.matches(element);
 }
 
 PassRefPtr<NodeList> SelectorQuery::queryAll(Node* rootNode) const
 {
-    SelectorChecker selectorChecker(rootNode->document(), SelectorChecker::QueryingRules);
-    return m_selectors.queryAll(selectorChecker, rootNode);
+    return m_selectors.queryAll(rootNode);
 }
 
 PassRefPtr<Element> SelectorQuery::queryFirst(Node* rootNode) const
 {
-    SelectorChecker selectorChecker(rootNode->document(), SelectorChecker::QueryingRules);
-    return m_selectors.queryFirst(selectorChecker, rootNode);
+    return m_selectors.queryFirst(rootNode);
 }
 

trunk/Source/WebCore/dom/SelectorQuery.h

@@ -28 +28 @@
 
 #include "CSSSelectorList.h"
-#include "SelectorChecker.h"
+#include <wtf/HashMap.h>
 #include <wtf/Vector.h>
+#include <wtf/text/AtomicStringHash.h>
 
 namespace WebCore {
@@ -36 +37 @@
     
 class CSSSelector;
+class Document;
 class Element;
 class Node;
@@ -43 +45 @@
 public:
     void initialize(const CSSSelectorList&);
-    bool matches(const SelectorChecker&, Element*) const;
-    PassRefPtr<NodeList> queryAll(const SelectorChecker&, Node* rootNode) const;
-    PassRefPtr<Element> queryFirst(const SelectorChecker&, Node* rootNode) const;
+    bool matches(Element*) const;
+    PassRefPtr<NodeList> queryAll(Node* rootNode) const;
+    PassRefPtr<Element> queryFirst(Node* rootNode) const;
 
 private:
@@ -56 +58 @@
     bool canUseIdLookup(Node* rootNode) const;
     template <bool firstMatchOnly>
-    void execute(const SelectorChecker&, Node* rootNode, Vector<RefPtr<Node> >&) const;
+    void execute(Node* rootNode, Vector<RefPtr<Node> >&) const;
 
     Vector<SelectorData> m_selectors;