Changeset 52899 in webkit

Timestamp:

Jan 6, 2010 8:45:10 PM (14 years ago)

Author:

tkent@chromium.org

Message:

2010-01-06 Kent Tamura <​tkent@chromium.org>

Reviewed by Darin Adler.

Use a static HashMap for HTMLElement::tagPriority().
​https://bugs.webkit.org/show_bug.cgi?id=33269

The prior code compares AtomicStringImpl pointers 18 times at
worst. This change avoids it.

No new tests because this is just a refactoring.

• html/HTMLElement.cpp: (WebCore::Empty1IntHashTraits): A HashTraits to return 1 as the empty value. (WebCore::initializeTagPriorityMap): Initialization of a static HashMap. (WebCore::HTMLElement::tagPriority): Use the static HashMap created by initializeTagPriorityMap().
• html/HTMLElement.h: (WebCore::HTMLElement::HTMLElement): Add an assertion about non-null localName().

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/HTMLElement.cpp (modified) (1 diff)
• html/HTMLElement.h (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-01-06  Kent Tamura  <tkent@chromium.org>
+
+        Reviewed by Darin Adler.
+
+        Use a static HashMap for HTMLElement::tagPriority().
+        https://bugs.webkit.org/show_bug.cgi?id=33269
+
+        The prior code compares AtomicStringImpl pointers 18 times at
+        worst. This change avoids it.
+
+        No new tests because this is just a refactoring.
+
+        * html/HTMLElement.cpp:
+        (WebCore::Empty1IntHashTraits): A HashTraits to return 1 as the empty value.
+        (WebCore::initializeTagPriorityMap): Initialization of a static HashMap.
+        (WebCore::HTMLElement::tagPriority): Use the static HashMap created by initializeTagPriorityMap().
+        * html/HTMLElement.h:
+        (WebCore::HTMLElement::HTMLElement): Add an assertion about non-null localName().
+
 2010-01-06  Mike Belshe  <mike@belshe.com>
 

trunk/WebCore/html/HTMLElement.cpp

@@ -83 +83 @@
 }
 
+struct Empty1IntHashTraits : HashTraits<int> {
+    static const bool emptyValueIsZero = false;
+    static int emptyValue() { return 1; }
+};
+typedef HashMap<AtomicStringImpl*, int, DefaultHash<AtomicStringImpl*>::Hash, HashTraits<AtomicStringImpl*>, Empty1IntHashTraits> TagPriorityMap;
+
+static const TagPriorityMap* createTagPriorityMap()
+{
+    TagPriorityMap* map = new TagPriorityMap;
+
+    map->add(wbrTag.localName().impl(), 0);
+
+    map->add(addressTag.localName().impl(), 3);
+    map->add(ddTag.localName().impl(), 3);
+    map->add(dtTag.localName().impl(), 3);
+    map->add(noscriptTag.localName().impl(), 3);
+    map->add(rpTag.localName().impl(), 3);
+    map->add(rtTag.localName().impl(), 3);
+
+    // 5 is same as <div>'s priority.
+    map->add(articleTag.localName().impl(), 5);
+    map->add(asideTag.localName().impl(), 5);
+    map->add(centerTag.localName().impl(), 5);
+    map->add(footerTag.localName().impl(), 5);
+    map->add(headerTag.localName().impl(), 5);
+    map->add(nobrTag.localName().impl(), 5);
+    map->add(rubyTag.localName().impl(), 5);
+    map->add(navTag.localName().impl(), 5);
+    map->add(sectionTag.localName().impl(), 5);
+
+    map->add(noembedTag.localName().impl(), 10);
+    map->add(noframesTag.localName().impl(), 10);
+
+    // TagPriorityMap returns 1 for unregistered tags. It's same as <span>.
+    // This way custom tag name elements will behave like inline spans.
+    return map;
+}
+
 int HTMLElement::tagPriority() const
 {
-    if (hasLocalName(wbrTag))
-        return 0;
-    if (hasLocalName(addressTag) || hasLocalName(ddTag) || hasLocalName(dtTag) || hasLocalName(noscriptTag) || hasLocalName(rpTag) || hasLocalName(rtTag))
-        return 3;
-    if (hasLocalName(articleTag) || hasLocalName(asideTag) || hasLocalName(centerTag) || hasLocalName(footerTag) || hasLocalName(headerTag) || hasLocalName(nobrTag) || hasLocalName(rubyTag) || hasLocalName(navTag) || hasLocalName(sectionTag))
-        return 5; // Same as <div>.
-    if (hasLocalName(noembedTag) || hasLocalName(noframesTag))
-        return 10;
-
-    // Same values as <span>.  This way custom tag name elements will behave like inline spans.
-    return 1;
+    static const TagPriorityMap* tagPriorityMap = createTagPriorityMap();
+    return tagPriorityMap->get(localName().impl());
 }
 

trunk/WebCore/html/HTMLElement.h

@@ -117 +117 @@
     : StyledElement(tagName, document, type)
 {
+    ASSERT(tagName.localName().impl());
 }