Changeset 62680 in webkit

Timestamp:

Jul 7, 2010 10:15:17 AM (14 years ago)

Author:

abarth@webkit.org

Message:

2010-07-07 Eric Seidel <​eric@webkit.org>

Reviewed by Adam Barth.

Grease the TreeBuilder's lightning
​https://bugs.webkit.org/show_bug.cgi?id=41756

Brings the new TreeBuilder from 7s to 3s on the parser benchmark.
This makes performance comparable to the old parser.

We have not begun to fight! There is so much fat left on these bones.

• html/HTMLFormattingElementList.cpp: (WebCore::HTMLFormattingElementList::find): (WebCore::HTMLFormattingElementList::bookmarkFor): (WebCore::HTMLFormattingElementList::insertAt): (WebCore::HTMLFormattingElementList::remove):
• html/HTMLFormattingElementList.h: (WebCore::HTMLFormattingElementList::findIndex):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/HTMLFormattingElementList.cpp (modified) (4 diffs)
• html/HTMLFormattingElementList.h (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-07-07  Eric Seidel  <eric@webkit.org>
+
+        Reviewed by Adam Barth.
+
+        Grease the TreeBuilder's lightning
+        https://bugs.webkit.org/show_bug.cgi?id=41756
+
+        Brings the new TreeBuilder from 7s to 3s on the parser benchmark.
+        This makes performance comparable to the old parser.
+
+        We have not begun to fight!  There is so much fat left on these bones.
+
+        * html/HTMLFormattingElementList.cpp:
+        (WebCore::HTMLFormattingElementList::find):
+        (WebCore::HTMLFormattingElementList::bookmarkFor):
+        (WebCore::HTMLFormattingElementList::insertAt):
+        (WebCore::HTMLFormattingElementList::remove):
+        * html/HTMLFormattingElementList.h:
+        (WebCore::HTMLFormattingElementList::findIndex):
+
 2010-07-07  Eric Seidel  <eric@webkit.org>
 

trunk/WebCore/html/HTMLFormattingElementList.cpp

@@ -59 +59 @@
 HTMLFormattingElementList::Entry* HTMLFormattingElementList::find(Element* element)
 {
-    size_t index = m_entries.find(element);
+    size_t index = findIndex(element);
     if (index != notFound) {
         // This is somewhat of a hack, and is why this method can't be const.
@@ -69 +69 @@
 HTMLFormattingElementList::Bookmark HTMLFormattingElementList::bookmarkFor(Element* element)
 {
-    size_t index = m_entries.find(element);
+    size_t index = findIndex(element);
     ASSERT(index != notFound);
     Element* elementBefore = (index > 1) ? m_entries[index - 1].element() : 0;
@@ -80 +80 @@
     size_t beforeIndex = notFound;
     if (bookmark.elementBefore()) {
-        beforeIndex = m_entries.find(bookmark.elementBefore());
+        beforeIndex = findIndex(bookmark.elementBefore());
         ASSERT(beforeIndex != notFound);
     }
     size_t afterIndex = notFound;
     if (bookmark.elementAfter()) {
-        afterIndex = m_entries.find(bookmark.elementAfter());
+        afterIndex = findIndex(bookmark.elementAfter());
         ASSERT(afterIndex != notFound);
     }
@@ -110 +110 @@
 void HTMLFormattingElementList::remove(Element* element)
 {
-    size_t index = m_entries.find(element);
+    size_t index = findIndex(element);
     if (index != notFound)
         m_entries.remove(index);

trunk/WebCore/html/HTMLFormattingElementList.h

@@ -125 +125 @@
 
 private:
+    size_t findIndex(Element* element) const
+    {
+        // A reverse find is more efficient than Vector<T>::find
+        for (size_t i = 1; i <= m_entries.size(); ++i) {
+            size_t index = m_entries.size() - i;
+            if (m_entries[index].element() == element)
+                return index;
+        }
+        return notFound;
+    }
     Vector<Entry> m_entries;
 };