Title: [151365] trunk/Source/WebCore
Revision
151365
Author
[email protected]
Date
2013-06-10 01:04:04 -0700 (Mon, 10 Jun 2013)

Log Message

Add special tree walking for the single tag or class CSS query selectors
https://bugs.webkit.org/show_bug.cgi?id=117388

Reviewed by Ryosuke Niwa.

Queries for a single tag name or a single class name are the most common
input of querySelector.

This patch adds a simplified tree walking in those cases, only checking that particular
case instead of a full selector.

With the change, the balanced query selector benchmarks become 11% faster.

* css/SelectorCheckerFastPath.cpp:
(WebCore::HTMLNames::checkClassValue):
* dom/SelectorQuery.cpp:
(WebCore::isSingleTagNameSelector):
(WebCore::SelectorDataList::executeSingleTagNameSelectorData):
(WebCore::isSingleClassNameSelector):
(WebCore::SelectorDataList::executeSingleClassNameSelectorData):
(WebCore::SelectorDataList::execute):
* dom/SelectorQuery.h:

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (151364 => 151365)


--- trunk/Source/WebCore/ChangeLog	2013-06-10 06:25:49 UTC (rev 151364)
+++ trunk/Source/WebCore/ChangeLog	2013-06-10 08:04:04 UTC (rev 151365)
@@ -1,3 +1,28 @@
+2013-06-10  Benjamin Poulain  <[email protected]>
+
+        Add special tree walking for the single tag or class CSS query selectors
+        https://bugs.webkit.org/show_bug.cgi?id=117388
+
+        Reviewed by Ryosuke Niwa.
+
+        Queries for a single tag name or a single class name are the most common
+        input of querySelector.
+
+        This patch adds a simplified tree walking in those cases, only checking that particular
+        case instead of a full selector.
+
+        With the change, the balanced query selector benchmarks become 11% faster.
+
+        * css/SelectorCheckerFastPath.cpp:
+        (WebCore::HTMLNames::checkClassValue):
+        * dom/SelectorQuery.cpp:
+        (WebCore::isSingleTagNameSelector):
+        (WebCore::SelectorDataList::executeSingleTagNameSelectorData):
+        (WebCore::isSingleClassNameSelector):
+        (WebCore::SelectorDataList::executeSingleClassNameSelectorData):
+        (WebCore::SelectorDataList::execute):
+        * dom/SelectorQuery.h:
+
 2013-06-09  Roger Fong  <[email protected]>
 
         Layout info should never be cleared before delayed scroll information updates.

Modified: trunk/Source/WebCore/css/SelectorCheckerFastPath.cpp (151364 => 151365)


--- trunk/Source/WebCore/css/SelectorCheckerFastPath.cpp	2013-06-10 06:25:49 UTC (rev 151364)
+++ trunk/Source/WebCore/css/SelectorCheckerFastPath.cpp	2013-06-10 08:04:04 UTC (rev 151365)
@@ -75,7 +75,7 @@
 
 inline bool checkClassValue(const Element* element, const CSSSelector* selector)
 {
-    return element->hasClass() && static_cast<const StyledElement*>(element)->classNames().contains(selector->value().impl());
+    return element->hasClass() && static_cast<const StyledElement*>(element)->classNames().contains(selector->value());
 }
 
 inline bool checkIDValue(const Element* element, const CSSSelector* selector)

Modified: trunk/Source/WebCore/dom/SelectorQuery.cpp (151364 => 151365)


--- trunk/Source/WebCore/dom/SelectorQuery.cpp	2013-06-10 06:25:49 UTC (rev 151364)
+++ trunk/Source/WebCore/dom/SelectorQuery.cpp	2013-06-10 08:04:04 UTC (rev 151365)
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011 Apple Inc. All rights reserved.
+ * Copyright (C) 2011, 2013 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -149,7 +149,49 @@
         matchedElements.append(element);
 }
 
+static bool isSingleTagNameSelector(const CSSSelector* selector)
+{
+    return selector->isLastInTagHistory() && selector->m_match == CSSSelector::Tag;
+}
+
 template <bool firstMatchOnly>
+ALWAYS_INLINE void SelectorDataList::executeSingleTagNameSelectorData(const Node* rootNode, const SelectorData& selectorData, Vector<RefPtr<Node> >& matchedElements) const
+{
+    ASSERT(m_selectors.size() == 1);
+    ASSERT(isSingleTagNameSelector(selectorData.selector));
+
+    const QualifiedName& tagQualifiedName = selectorData.selector->tagQName();
+    for (Element* element = ElementTraversal::firstWithin(rootNode); element; element = ElementTraversal::next(element, rootNode)) {
+        if (SelectorChecker::tagMatches(element, tagQualifiedName)) {
+            matchedElements.append(element);
+            if (firstMatchOnly)
+                return;
+        }
+    }
+}
+
+static bool isSingleClassNameSelector(const CSSSelector* selector)
+{
+    return selector->isLastInTagHistory() && selector->m_match == CSSSelector::Class;
+}
+
+template <bool firstMatchOnly>
+ALWAYS_INLINE void SelectorDataList::executeSingleClassNameSelectorData(const Node* rootNode, const SelectorData& selectorData, Vector<RefPtr<Node> >& matchedElements) const
+{
+    ASSERT(m_selectors.size() == 1);
+    ASSERT(isSingleClassNameSelector(selectorData.selector));
+
+    const AtomicString& className = selectorData.selector->value();
+    for (Element* element = ElementTraversal::firstWithin(rootNode); element; element = ElementTraversal::next(element, rootNode)) {
+        if (element->hasClass() && static_cast<const StyledElement*>(element)->classNames().contains(className)) {
+            matchedElements.append(element);
+            if (firstMatchOnly)
+                return;
+        }
+    }
+}
+
+template <bool firstMatchOnly>
 ALWAYS_INLINE void SelectorDataList::executeSingleSelectorData(const Node* rootNode, const SelectorData& selectorData, Vector<RefPtr<Node> >& matchedElements) const
 {
     ASSERT(m_selectors.size() == 1);
@@ -186,6 +228,10 @@
         const SelectorData& selectorData = m_selectors[0];
         if (const CSSSelector* idSelector = selectorForIdLookup(rootNode, selectorData.selector))
             executeFastPathForIdSelector<firstMatchOnly>(rootNode, selectorData, idSelector, matchedElements);
+        else if (isSingleTagNameSelector(selectorData.selector))
+            executeSingleTagNameSelectorData<firstMatchOnly>(rootNode, selectorData, matchedElements);
+        else if (isSingleClassNameSelector(selectorData.selector))
+            executeSingleClassNameSelectorData<firstMatchOnly>(rootNode, selectorData, matchedElements);
         else
             executeSingleSelectorData<firstMatchOnly>(rootNode, selectorData, matchedElements);
         return;

Modified: trunk/Source/WebCore/dom/SelectorQuery.h (151364 => 151365)


--- trunk/Source/WebCore/dom/SelectorQuery.h	2013-06-10 06:25:49 UTC (rev 151364)
+++ trunk/Source/WebCore/dom/SelectorQuery.h	2013-06-10 08:04:04 UTC (rev 151365)
@@ -62,6 +62,8 @@
     void execute(Node* rootNode, Vector<RefPtr<Node> >&) const;
 
     template <bool firstMatchOnly> void executeFastPathForIdSelector(const Node* rootNode, const SelectorData&, const CSSSelector* idSelector, Vector<RefPtr<Node> >&) const;
+    template <bool firstMatchOnly> void executeSingleTagNameSelectorData(const Node* rootNode, const SelectorData&, Vector<RefPtr<Node> >&) const;
+    template <bool firstMatchOnly> void executeSingleClassNameSelectorData(const Node* rootNode, const SelectorData&, Vector<RefPtr<Node> >&) const;
     template <bool firstMatchOnly> void executeSingleSelectorData(const Node* rootNode, const SelectorData&, Vector<RefPtr<Node> >&) const;
     template <bool firstMatchOnly> void executeSingleMultiSelectorData(const Node* rootNode, Vector<RefPtr<Node> >&) const;
 
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to