Changeset 62082 in webkit

Timestamp:

Jun 28, 2010 9:31:40 PM (14 years ago)

Author:

eric@webkit.org

Message:

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

Reviewed by Adam Barth.

Implement HTMLTreeBuilder::reconstructTheActiveFormattingElements
​https://bugs.webkit.org/show_bug.cgi?id=41319

Restructure the code to not use in-band data, which is what
got us in trouble with a signed/unsigned mismatch before.

• html/HTMLTreeBuilder.cpp: (WebCore::HTMLTreeBuilder::indexOfFirstUnopenFormattingElement): (WebCore::HTMLTreeBuilder::reconstructTheActiveFormattingElements):
• html/HTMLTreeBuilder.h:

Location:

trunk/WebCore

Files:

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

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-06-28  Eric Seidel  <eric@webkit.org>
+
+        Reviewed by Adam Barth.
+
+        Implement HTMLTreeBuilder::reconstructTheActiveFormattingElements
+        https://bugs.webkit.org/show_bug.cgi?id=41319
+
+        Restructure the code to not use in-band data, which is what
+        got us in trouble with a signed/unsigned mismatch before.
+
+        * html/HTMLTreeBuilder.cpp:
+        (WebCore::HTMLTreeBuilder::indexOfFirstUnopenFormattingElement):
+        (WebCore::HTMLTreeBuilder::reconstructTheActiveFormattingElements):
+        * html/HTMLTreeBuilder.h:
+
 2010-06-28  Daniel Bates  <dbates@rim.com>
 

trunk/WebCore/html/HTMLTreeBuilder.cpp

@@ -915 +915 @@
 }
 
-int HTMLTreeBuilder::indexOfLastOpenFormattingElementOrMarker() const
-{
-    ASSERT(!m_activeFormattingElements.isEmpty());
-    for (int index = m_activeFormattingElements.size() - 1; index >= 0; --index) {
+bool HTMLTreeBuilder::indexOfFirstUnopenFormattingElement(unsigned& firstUnopenElementIndex) const
+{
+    if (m_activeFormattingElements.isEmpty())
+        return false;
+    unsigned index = m_activeFormattingElements.size();
+    do {
+        --index;
         const FormattingElementEntry& entry = m_activeFormattingElements[index];
-        if (entry.isMarker() || m_openElements.contains(entry.element()))
-            return index;
-    }
-    return -1; // No elements are open!
-}
-
-void HTMLTreeBuilder::reopenFormattingElementsAfterIndex(unsigned lastOpenElementIndex)
-{
+        if (entry.isMarker() || m_openElements.contains(entry.element())) {
+            firstUnopenElementIndex = index;
+            return true;
+        }
+    } while (index);
+    return false;
+}
+
+void HTMLTreeBuilder::reconstructTheActiveFormattingElements()
+{
+    unsigned firstUnopenElementIndex;
+    if (!indexOfFirstUnopenFormattingElement(firstUnopenElementIndex))
+        return;
+
     Vector<FormattingElementEntry>& stack = m_activeFormattingElements;
-    unsigned unopenEntryIndex = lastOpenElementIndex + 1;
+    unsigned unopenEntryIndex = firstUnopenElementIndex;
     ASSERT(unopenEntryIndex < stack.size());
     for (; unopenEntryIndex < stack.size(); ++unopenEntryIndex) {
@@ -940 +949 @@
 }
 
-void HTMLTreeBuilder::reconstructTheActiveFormattingElements()
-{
-    if (m_activeFormattingElements.isEmpty())
-        return;
-
-    int lastOpenElementIndex = indexOfLastOpenFormattingElementOrMarker();
-    if (lastOpenElementIndex < m_activeFormattingElements.size() - 1)
-        reopenFormattingElementsAfterIndex(lastOpenElementIndex);
-}
-
 void HTMLTreeBuilder::finished()
 {

trunk/WebCore/html/HTMLTreeBuilder.h

@@ -216 +216 @@
 
     PassRefPtr<Element> createElement(AtomicHTMLToken&);
-    int indexOfLastOpenFormattingElementOrMarker() const;
-    void reopenFormattingElementsAfterIndex(unsigned lastOpenElementIndex);
+
+    bool indexOfFirstUnopenFormattingElement(unsigned& firstUnopenElementIndex) const;
     void reconstructTheActiveFormattingElements();