Changeset 203439 in webkit

Timestamp:

Jul 19, 2016, 6:29:25 PM (10 years ago)

Author:

benjamin@webkit.org

Message:

Use getElementById for attribute matching if the attribute name is html's id
​https://bugs.webkit.org/show_bug.cgi?id=159960

Patch by Benjamin Poulain <​bpoulain@apple.com> on 2016-07-19
Reviewed by Chris Dumez.

Source/WebCore:

Elliott Sprehn discovered YUI makes heavy uses of querySelector with [id=value]
(​https://bugs.chromium.org/p/chromium/issues/detail?id=627242).

If we are not in quirks mode, IdForStyleResolution has the same value
as the Id attribute. We can use the same optimization for both cases.

Tests: fast/selectors/id-attribute-querySelector-used-as-id-selector-quirks.html

fast/selectors/id-attribute-querySelector-used-as-id-selector.html

• dom/SelectorQuery.cpp:

(WebCore::canBeUsedForIdFastPath):
(WebCore::findIdMatchingType):
(WebCore::SelectorDataList::SelectorDataList):
(WebCore::selectorForIdLookup):
(WebCore::filterRootById):

LayoutTests:

• fast/selectors/id-attribute-querySelector-used-as-id-selector-expected.txt: Added.
• fast/selectors/id-attribute-querySelector-used-as-id-selector-quirks-expected.txt: Added.
• fast/selectors/id-attribute-querySelector-used-as-id-selector-quirks.html: Added.
• fast/selectors/id-attribute-querySelector-used-as-id-selector.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/selectors/id-attribute-querySelector-used-as-id-selector-expected.txt (added)
• LayoutTests/fast/selectors/id-attribute-querySelector-used-as-id-selector-quirks-expected.txt (added)
• LayoutTests/fast/selectors/id-attribute-querySelector-used-as-id-selector-quirks.html (added)
• LayoutTests/fast/selectors/id-attribute-querySelector-used-as-id-selector.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/dom/SelectorQuery.cpp (modified) (7 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2016-07-19  Benjamin Poulain  <bpoulain@apple.com>
+
+        Use getElementById for attribute matching if the attribute name is html's id
+        https://bugs.webkit.org/show_bug.cgi?id=159960
+
+        Reviewed by Chris Dumez.
+
+        * fast/selectors/id-attribute-querySelector-used-as-id-selector-expected.txt: Added.
+        * fast/selectors/id-attribute-querySelector-used-as-id-selector-quirks-expected.txt: Added.
+        * fast/selectors/id-attribute-querySelector-used-as-id-selector-quirks.html: Added.
+        * fast/selectors/id-attribute-querySelector-used-as-id-selector.html: Added.
+
 2016-07-19  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-07-19  Benjamin Poulain  <bpoulain@apple.com>
+
+        Use getElementById for attribute matching if the attribute name is html's id
+        https://bugs.webkit.org/show_bug.cgi?id=159960
+
+        Reviewed by Chris Dumez.
+
+        Elliott Sprehn discovered YUI makes heavy uses of querySelector with [id=value]
+        (https://bugs.chromium.org/p/chromium/issues/detail?id=627242).
+
+        If we are not in quirks mode, IdForStyleResolution has the same value
+        as the Id attribute. We can use the same optimization for both cases.
+
+        Tests: fast/selectors/id-attribute-querySelector-used-as-id-selector-quirks.html
+               fast/selectors/id-attribute-querySelector-used-as-id-selector.html
+
+        * dom/SelectorQuery.cpp:
+        (WebCore::canBeUsedForIdFastPath):
+        (WebCore::findIdMatchingType):
+        (WebCore::SelectorDataList::SelectorDataList):
+        (WebCore::selectorForIdLookup):
+        (WebCore::filterRootById):
+
 2016-07-19  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/dom/SelectorQuery.cpp

@@ -1 +1 @@
 /*
- * Copyright (C) 2011, 2013, 2014 Apple Inc. All rights reserved.
+ * Copyright (C) 2011, 2013, 2014, 2016 Apple Inc. All rights reserved.
  * Copyright (C) 2014 Yusuke Suzuki <utatane.tea@gmail.com>
  *
@@ -30 +30 @@
 #include "CSSParser.h"
 #include "ElementDescendantIterator.h"
+#include "HTMLNames.h"
 #include "SelectorChecker.h"
 #include "StaticNodeList.h"
@@ -54 +55 @@
 };
 
+static bool canBeUsedForIdFastPath(const CSSSelector& selector)
+{
+    return selector.match() == CSSSelector::Id
+        || (selector.match() == CSSSelector::Exact && selector.attribute() == HTMLNames::idAttr && !selector.attributeValueMatchingIsCaseInsensitive());
+}
+
 static IdMatchingType findIdMatchingType(const CSSSelector& firstSelector)
 {
     bool inRightmost = true;
     for (const CSSSelector* selector = &firstSelector; selector; selector = selector->tagHistory()) {
-        if (selector->match() == CSSSelector::Id) {
+        if (canBeUsedForIdFastPath(*selector)) {
             if (inRightmost)
                 return IdMatchingType::Rightmost;
@@ -89 +96 @@
                 m_matchType = ClassNameMatch;
                 break;
-            case CSSSelector::Id:
-                m_matchType = RightMostWithIdMatch;
-                break;
             default:
-                m_matchType = CompilableSingle;
+                if (canBeUsedForIdFastPath(selector))
+                    m_matchType = RightMostWithIdMatch;
+                else
+                    m_matchType = CompilableSingle;
                 break;
             }
@@ -195 +202 @@
 
     for (const CSSSelector* selector = &firstSelector; selector; selector = selector->tagHistory()) {
-        if (selector->match() == CSSSelector::Id)
+        if (canBeUsedForIdFastPath(*selector))
             return selector;
         if (selector->relation() != CSSSelector::SubSelector)
@@ -248 +255 @@
     const CSSSelector* selector = &firstSelector;
     do {
-        ASSERT(selector->match() != CSSSelector::Id);
+        ASSERT(!canBeUsedForIdFastPath(*selector));
         if (selector->relation() != CSSSelector::SubSelector)
             break;
@@ -256 +263 @@
     bool inAdjacentChain = false;
     for (; selector; selector = selector->tagHistory()) {
-        if (selector->match() == CSSSelector::Id) {
+        if (canBeUsedForIdFastPath(*selector)) {
             const AtomicString& idToMatch = selector->value();
             if (ContainerNode* searchRoot = rootNode.treeScope().getElementById(idToMatch)) {