Changeset 175788 in webkit

Timestamp:

Nov 8, 2014, 9:59:52 PM (11 years ago)

Author:

Chris Dumez

Message:

Call faster HTMLElement::hasTagName() in HTMLCollection
​https://bugs.webkit.org/show_bug.cgi?id=138529

Reviewed by Darin Adler.

Call faster HTMLElement::hasTagName() in HTMLCollection instead of
slower Node::hasTagName() by restructuring the code a bit to
distinguish collection that deal only with HTMLElements from others.

No new tests, no behavior change.

• html/HTMLCollection.cpp:

(WebCore::isMatchingHTMLElement):
(WebCore::isMatchingElement):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/HTMLCollection.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-11-08  Chris Dumez  <cdumez@apple.com>
+
+        Call faster HTMLElement::hasTagName() in HTMLCollection
+        https://bugs.webkit.org/show_bug.cgi?id=138529
+
+        Reviewed by Darin Adler.
+
+        Call faster HTMLElement::hasTagName() in HTMLCollection instead of
+        slower Node::hasTagName() by restructuring the code a bit to
+        distinguish collection that deal only with HTMLElements from others.
+
+        No new tests, no behavior change.
+
+        * html/HTMLCollection.cpp:
+        (WebCore::isMatchingHTMLElement):
+        (WebCore::isMatchingElement):
+
 2014-11-08  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/html/HTMLCollection.cpp

@@ -170 +170 @@
 }
 
-inline bool isMatchingElement(const HTMLCollection& htmlCollection, Element& element)
-{
-    CollectionType type = htmlCollection.type();
-    if (!element.isHTMLElement() && !(type == DocAll || type == NodeChildren || type == WindowNamedItems))
-        return false;
-
-    switch (type) {
+inline bool isMatchingHTMLElement(const HTMLCollection& collection, HTMLElement& element)
+{
+    switch (collection.type()) {
     case DocImages:
         return element.hasTagName(imgTag);
@@ -210 +206 @@
     case DocAnchors:
         return element.hasTagName(aTag) && element.fastHasAttribute(nameAttr);
+    case DocumentNamedItems:
+        return static_cast<const DocumentNameCollection&>(collection).elementMatches(element);
+    case DocAll:
+    case NodeChildren:
+    case WindowNamedItems:
+    case FormControls:
+    case TableRows:
+        break;
+    }
+    ASSERT_NOT_REACHED();
+    return false;
+}
+
+inline bool isMatchingElement(const HTMLCollection& collection, Element& element)
+{
+    // Collection types that deal with any type of Elements, not just HTMLElements.
+    switch (collection.type()) {
     case DocAll:
     case NodeChildren:
         return true;
-    case DocumentNamedItems:
-        return static_cast<const DocumentNameCollection&>(htmlCollection).elementMatches(element);
     case WindowNamedItems:
-        return static_cast<const WindowNameCollection&>(htmlCollection).elementMatches(element);
-    case FormControls:
-    case TableRows:
-        break;
-    }
-    ASSERT_NOT_REACHED();
-    return false;
+        return static_cast<const WindowNameCollection&>(collection).elementMatches(element);
+    default:
+        // Collection types that only deal with HTMLElements.
+        return is<HTMLElement>(element) && isMatchingHTMLElement(collection, downcast<HTMLElement>(element));
+    }
 }