Changeset 62077 in webkit

Timestamp:

Jun 28, 2010 7:52:32 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

This is basically a direct transcription of HTML5 TreeBuilder spec:

​http://www.whatwg.org/specs/web-apps/current-work/multipage/parsing.html#list-of-active-formatting-elements

This code is covered by various tests in html5lib/runner which we
can't run yet due to other asserts. Adam and I are working on
getting rid of those ASSERTS so that this (and other code) will
be better tested shortly.

• html/HTMLTreeBuilder.cpp: (WebCore::HTMLTreeBuilder::insertFormatingElement): (WebCore::HTMLTreeBuilder::reconstructTheActiveFormattingElements):
• html/HTMLTreeBuilder.h: (WebCore::HTMLTreeBuilder::ElementStack::contains): (WebCore::HTMLTreeBuilder::FormatingElementEntry::FormatingElementEntry): (WebCore::HTMLTreeBuilder::FormatingElementEntry::): (WebCore::HTMLTreeBuilder::FormatingElementEntry::isMarker): (WebCore::HTMLTreeBuilder::FormatingElementEntry::element): (WebCore::HTMLTreeBuilder::FormatingElementEntry::replaceElement):

Location:

trunk/WebCore

Files:

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

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
+
+        This is basically a direct transcription of HTML5 TreeBuilder spec:
+         http://www.whatwg.org/specs/web-apps/current-work/multipage/parsing.html#list-of-active-formatting-elements
+
+        This code is covered by various tests in html5lib/runner which we
+        can't run yet due to other asserts.  Adam and I are working on
+        getting rid of those ASSERTS so that this (and other code) will
+        be better tested shortly.
+
+        * html/HTMLTreeBuilder.cpp:
+        (WebCore::HTMLTreeBuilder::insertFormatingElement):
+        (WebCore::HTMLTreeBuilder::reconstructTheActiveFormattingElements):
+        * html/HTMLTreeBuilder.h:
+        (WebCore::HTMLTreeBuilder::ElementStack::contains):
+        (WebCore::HTMLTreeBuilder::FormatingElementEntry::FormatingElementEntry):
+        (WebCore::HTMLTreeBuilder::FormatingElementEntry::):
+        (WebCore::HTMLTreeBuilder::FormatingElementEntry::isMarker):
+        (WebCore::HTMLTreeBuilder::FormatingElementEntry::element):
+        (WebCore::HTMLTreeBuilder::FormatingElementEntry::replaceElement):
+
 2010-06-28  Adam Barth  <abarth@webkit.org>
 

trunk/WebCore/html/HTMLTreeBuilder.cpp

@@ -428 +428 @@
             notImplemented();
             reconstructTheActiveFormattingElements();
-            insertFormatingElement(token);
+            insertFormattingElement(token);
             return;
         }
         if (token.name() == bTag || token.name() == bigTag || token.name() == codeTag || token.name() == emTag || token.name() == fontTag || token.name() == iTag || token.name() == sTag || token.name() == smallTag || token.name() == strikeTag || token.name() == strongTag || token.name() == ttTag || token.name() == uTag) {
             reconstructTheActiveFormattingElements();
-            insertFormatingElement(token);
+            insertFormattingElement(token);
             return;
         }
@@ -439 +439 @@
             reconstructTheActiveFormattingElements();
             notImplemented();
-            insertFormatingElement(token);
+            insertFormattingElement(token);
             return;
         }
@@ -865 +865 @@
 }
 
-void HTMLTreeBuilder::insertFormatingElement(AtomicHTMLToken& token)
-{
+void HTMLTreeBuilder::insertFormattingElement(AtomicHTMLToken& token)
+{
+    // http://www.whatwg.org/specs/web-apps/current-work/multipage/parsing.html#the-stack-of-open-elements
+    // Possible active formatting elements include:
+    // a, b, big, code, em, font, i, nobr, s, small, strike, strong, tt, and u.
     insertElement(token);
     m_activeFormattingElements.append(currentElement());
@@ -912 +915 @@
 }
 
+unsigned HTMLTreeBuilder::indexOfLastOpenFormattingElementOrMarker() const
+{
+    ASSERT(!m_activeFormattingElements.isEmpty());
+    for (int index = m_activeFormattingElements.size() - 1; index >= 0; --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)
+{
+    Vector<FormattingElementEntry>& stack = m_activeFormattingElements;
+    unsigned unopenEntryIndex = lastOpenElementIndex + 1;
+    ASSERT(unopenEntryIndex < stack.size());
+    for (; unopenEntryIndex < stack.size(); ++unopenEntryIndex) {
+        FormattingElementEntry& unopenedEntry = stack[unopenEntryIndex];
+        // FIXME: We're supposed to save the original token in the entry.
+        AtomicHTMLToken fakeToken(HTMLToken::StartTag, unopenedEntry.element()->localName());
+        insertElement(fakeToken);
+        unopenedEntry.replaceElement(currentElement());
+    }
+}
+
 void HTMLTreeBuilder::reconstructTheActiveFormattingElements()
 {
-    notImplemented();
+    if (m_activeFormattingElements.isEmpty())
+        return;
+
+    unsigned lastOpenElementIndex = indexOfLastOpenFormattingElementOrMarker();
+    if (lastOpenElementIndex < m_activeFormattingElements.size() - 1)
+        reopenFormattingElementsAfterIndex(lastOpenElementIndex);
 }
 

trunk/WebCore/html/HTMLTreeBuilder.h

@@ -153 +153 @@
         }
 
+        bool contains(Element* element) const
+        {
+            for (ElementRecord* pos = m_top.get(); pos; pos = pos->next()) {
+                if (pos->element() == element)
+                    return true;
+            }
+            return false;
+        }
+
     private:
         OwnPtr<ElementRecord> m_top;
@@ -197 +206 @@
     void insertElement(AtomicHTMLToken&);
     void insertSelfClosingElement(AtomicHTMLToken&);
-    void insertFormatingElement(AtomicHTMLToken&);
+    void insertFormattingElement(AtomicHTMLToken&);
     void insertGenericRCDATAElement(AtomicHTMLToken&);
     void insertGenericRawTextElement(AtomicHTMLToken&);
@@ -207 +216 @@
 
     PassRefPtr<Element> createElement(AtomicHTMLToken&);
+    unsigned indexOfLastOpenFormattingElementOrMarker() const;
+    void reopenFormattingElementsAfterIndex(unsigned lastOpenElementIndex);
     void reconstructTheActiveFormattingElements();
 
@@ -214 +225 @@
     RefPtr<Element> m_formElement;
     ElementStack m_openElements;
-    Vector<Element*> m_activeFormattingElements;
+
+    class FormattingElementEntry {
+    public:
+        FormattingElementEntry(Element* element)
+            : m_element(element)
+        {
+            ASSERT(element);
+        }
+
+        enum MarkerEntryType { MarkerEntry };
+        FormattingElementEntry(MarkerEntryType)
+        {
+        }
+
+        bool isMarker() const { return !m_element; }
+
+        Element* element() const
+        {
+            // The fact that !m_element == isMarker is an implementation detail
+            // callers should check isMarker() before calling element().
+            ASSERT(m_element);
+            return m_element.get();
+        }
+
+        void replaceElement(PassRefPtr<Element> element)
+        {
+            ASSERT(m_element); // Once a marker, always a marker.
+            m_element = element;
+        }
+
+    private:
+        RefPtr<Element> m_element;
+    };
+
+    Vector<FormattingElementEntry> m_activeFormattingElements;
     bool m_framesetOk;