Changeset 35406 in webkit

Timestamp:

Jul 27, 2008 3:03:41 PM (16 years ago)

Author:

weinig@apple.com

Message:

WebCore:

2008-07-27 Sam Weinig <​sam@webkit.org>

Reviewed by Oliver Hunt.

Fix for ​https://bugs.webkit.org/show_bug.cgi?id=20176
querySelectorAll id optimization no longer working

Turn the querySelector/querySelectorAll id optimization back on
for only strict and almost strict mode. In quirks mode, the optimiztion
won't work as the id match is not case sensitive.

Tests: fast/dom/SelectorAPI/caseID-almost-strict.html

fast/dom/SelectorAPI/caseID-strict.html
fast/dom/SelectorAPI/caseID.html

• dom/Node.cpp: (WebCore::Node::querySelector): (WebCore::Node::querySelectorAll):
• dom/SelectorNodeList.cpp: (WebCore::createSelectorNodeList):
• dom/SelectorNodeList.h:

LayoutTests:

2008-07-27 Sam Weinig <​sam@webkit.org>

Reviewed by Oliver Hunt.

Tests for ​https://bugs.webkit.org/show_bug.cgi?id=20176
querySelectorAll id optimization no longer working

• fast/dom/SelectorAPI/caseID-almost-strict-expected.txt: Added.
• fast/dom/SelectorAPI/caseID-almost-strict.html: Added.
• fast/dom/SelectorAPI/caseID-expected.txt: Added.
• fast/dom/SelectorAPI/caseID-strict-expected.txt: Added.
• fast/dom/SelectorAPI/caseID-strict.html: Added.
• fast/dom/SelectorAPI/caseID.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/dom/SelectorAPI/caseID-almost-strict-expected.txt (added)
• LayoutTests/fast/dom/SelectorAPI/caseID-almost-strict.html (added)
• LayoutTests/fast/dom/SelectorAPI/caseID-expected.txt (added)
• LayoutTests/fast/dom/SelectorAPI/caseID-strict-expected.txt (added)
• LayoutTests/fast/dom/SelectorAPI/caseID-strict.html (added)
• LayoutTests/fast/dom/SelectorAPI/caseID.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/dom/Node.cpp (modified) (4 diffs)
• WebCore/dom/SelectorNodeList.cpp (modified) (1 diff)
• WebCore/dom/SelectorNodeList.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2008-07-27  Sam Weinig  <sam@webkit.org>
+
+        Reviewed by Oliver Hunt.
+
+        Tests for https://bugs.webkit.org/show_bug.cgi?id=20176
+        querySelectorAll id optimization no longer working
+
+        * fast/dom/SelectorAPI/caseID-almost-strict-expected.txt: Added.
+        * fast/dom/SelectorAPI/caseID-almost-strict.html: Added.
+        * fast/dom/SelectorAPI/caseID-expected.txt: Added.
+        * fast/dom/SelectorAPI/caseID-strict-expected.txt: Added.
+        * fast/dom/SelectorAPI/caseID-strict.html: Added.
+        * fast/dom/SelectorAPI/caseID.html: Added.
+
 2008-07-27  Anatoli Papirovski  <apapirovski@mac.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-07-27  Sam Weinig  <sam@webkit.org>
+
+        Reviewed by Oliver Hunt.
+
+        Fix for https://bugs.webkit.org/show_bug.cgi?id=20176
+        querySelectorAll id optimization no longer working
+
+        Turn the querySelector/querySelectorAll id optimization back on
+        for only strict and almost strict mode.  In quirks mode, the optimiztion
+        won't work as the id match is not case sensitive.
+
+        Tests: fast/dom/SelectorAPI/caseID-almost-strict.html
+               fast/dom/SelectorAPI/caseID-strict.html
+               fast/dom/SelectorAPI/caseID.html
+
+        * dom/Node.cpp:
+        (WebCore::Node::querySelector):
+        (WebCore::Node::querySelectorAll):
+        * dom/SelectorNodeList.cpp:
+        (WebCore::createSelectorNodeList):
+        * dom/SelectorNodeList.h:
+
 2008-07-27  Anatoli Papirovski  <apapirovski@mac.com>
 

trunk/WebCore/dom/Node.cpp

@@ -1330 +1330 @@
         return 0;
     }
-    CSSParser p(!document()->inCompatMode());
+    bool strictParsing = !document()->inCompatMode();
+    CSSParser p(strictParsing);
     if (resolver) {
         String defaultNamespace = resolver->lookupNamespaceURI(exec, String());
         if (exec && exec->hadException())
-            return false;
+            return 0;
         if (!defaultNamespace.isEmpty())
             p.m_defaultNamespace = defaultNamespace;
@@ -1357 +1358 @@
     }
 
-    if (inDocument() && !querySelector->next() && querySelector->m_match == CSSSelector::Id
-            && !querySelector->hasTag() && !querySelector->hasAttribute()
-            && !querySelector->m_tagHistory && !querySelector->m_simpleSelector) {
+    // FIXME: we could also optimize for the the [id="foo"] case
+    if (strictParsing && inDocument() && !querySelector->next() && querySelector->m_match == CSSSelector::Id
+            && !querySelector->hasTag() && !querySelector->m_tagHistory && !querySelector->m_simpleSelector) {
+        ASSERT(querySelector->m_attr == idAttr);
         Element* element = document()->getElementById(querySelector->m_value);
         if (element && (isDocumentNode() || element->isDescendantOf(this)))
@@ -1366 +1368 @@
     }
 
-    CSSStyleSelector::SelectorChecker selectorChecker(document(), !document()->inCompatMode());
+    CSSStyleSelector::SelectorChecker selectorChecker(document(), strictParsing);
 
     // FIXME: We can speed this up by implementing caching similar to the one use by getElementById
@@ -1388 +1390 @@
         return 0;
     }
-    CSSParser p(!document()->inCompatMode());
+    bool strictParsing = !document()->inCompatMode();
+    CSSParser p(strictParsing);
     if (resolver) {
         String defaultNamespace = resolver->lookupNamespaceURI(exec, String());

trunk/WebCore/dom/SelectorNodeList.cpp

@@ -34 +34 @@
 #include "Document.h"
 #include "Element.h"
+#include "HTMLNames.h"
 
 namespace WebCore {
 
-PassRefPtr<StaticNodeList> createSelectorNodeList(PassRefPtr<Node> rootNode, CSSSelector* querySelector)
+using namespace HTMLNames;
+
+PassRefPtr<StaticNodeList> createSelectorNodeList(Node* rootNode, CSSSelector* querySelector)
 {
     Vector<RefPtr<Node> > nodes;
     Document* document = rootNode->document();
     AtomicString selectorValue = querySelector->m_value;
+    bool strictParsing = !document->inCompatMode();
 
-    if (rootNode->inDocument() && !querySelector->next() && querySelector->m_match == CSSSelector::Id
-            && !querySelector->hasTag() && !querySelector->hasAttribute() 
-            && !querySelector->m_tagHistory && !querySelector->m_simpleSelector
+    if (strictParsing && rootNode->inDocument() && !querySelector->next() && querySelector->m_match == CSSSelector::Id
+            && !querySelector->hasTag() && !querySelector->m_tagHistory && !querySelector->m_simpleSelector
             && !document->containsMultipleElementsWithId(selectorValue)) {
+        ASSERT(querySelector->m_attr == idAttr);
         Element* element = document->getElementById(selectorValue);
-        if (element && (rootNode->isDocumentNode() || element->isDescendantOf(rootNode.get())))
+        if (element && (rootNode->isDocumentNode() || element->isDescendantOf(rootNode)))
             nodes.append(element);
     } else {
-        CSSStyleSelector::SelectorChecker selectorChecker(document, !document->inCompatMode());
-        
-        for (Node* n = rootNode->firstChild(); n; n = n->traverseNextNode(rootNode.get())) {
+        CSSStyleSelector::SelectorChecker selectorChecker(document, strictParsing);
+        for (Node* n = rootNode->firstChild(); n; n = n->traverseNextNode(rootNode)) {
             if (n->isElementNode()) {
                 Element* element = static_cast<Element*>(n);

trunk/WebCore/dom/SelectorNodeList.h

@@ -36 +36 @@
     class CSSSelector;
 
-    PassRefPtr<StaticNodeList> createSelectorNodeList(PassRefPtr<Node> rootNode, CSSSelector*);
+    PassRefPtr<StaticNodeList> createSelectorNodeList(Node* rootNode, CSSSelector*);
 
 } // namespace WebCore