Changeset 63815 in webkit

Timestamp:

Jul 21, 2010 5:53:21 AM (14 years ago)

Author:

abarth@webkit.org

Message:

2010-07-21 Adam Barth <​abarth@webkit.org>

Reviewed by Eric Seidel.

Associate elements with the active form
​https://bugs.webkit.org/show_bug.cgi?id=42728

This patch fixes fast/forms/formmove3.html. The test still doesn't
pass due to some render tree differences, but it works as intended now.

To fix this test, I needed to deviate from the spec slight. Minefield
seems to have the same deviation:

• ​http://www.w3.org/Bugs/Public/show_bug.cgi?id=10216

• html/HTMLConstructionSite.cpp: (WebCore::HTMLConstructionSite::takeForm): (WebCore::HTMLConstructionSite::setForm): (WebCore::HTMLConstructionSite::createHTMLElement):
• html/HTMLConstructionSite.h: (WebCore::HTMLConstructionSite::form):
• html/HTMLTreeBuilder.cpp: (WebCore::HTMLTreeBuilder::processStartTagForInBody):

Location:

trunk/WebCore

Files:

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

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-07-21  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        Associate elements with the active form
+        https://bugs.webkit.org/show_bug.cgi?id=42728
+
+        This patch fixes fast/forms/formmove3.html.  The test still doesn't
+        pass due to some render tree differences, but it works as intended now.
+
+        To fix this test, I needed to deviate from the spec slight.  Minefield
+        seems to have the same deviation:
+          - http://www.w3.org/Bugs/Public/show_bug.cgi?id=10216
+
+        * html/HTMLConstructionSite.cpp:
+        (WebCore::HTMLConstructionSite::takeForm):
+        (WebCore::HTMLConstructionSite::setForm):
+        (WebCore::HTMLConstructionSite::createHTMLElement):
+        * html/HTMLConstructionSite.h:
+        (WebCore::HTMLConstructionSite::form):
+        * html/HTMLTreeBuilder.cpp:
+        (WebCore::HTMLTreeBuilder::processStartTagForInBody):
+
 2010-07-21  Adam Barth  <abarth@webkit.org>
 

trunk/WebCore/html/HTMLConstructionSite.cpp

@@ -33 +33 @@
 #include "Frame.h"
 #include "HTMLDocument.h"
+#include "HTMLElementFactory.h"
+#include "HTMLFormElement.h"
 #include "HTMLHtmlElement.h"
 #include "HTMLNames.h"
@@ -142 +144 @@
 }
 
+PassRefPtr<HTMLFormElement> HTMLConstructionSite::takeForm()
+{
+    return m_form.release();
+}
+
 void HTMLConstructionSite::dispatchDocumentElementAvailableIfNeeded()
 {
@@ -233 +240 @@
     ASSERT(!shouldFosterParent());
     m_openElements.pushHTMLBodyElement(attachToCurrent(createHTMLElement(token)));
+}
+
+void HTMLConstructionSite::insertHTMLFormElement(AtomicHTMLToken& token)
+{
+    insertHTMLElement(token);
+    ASSERT(currentElement()->isHTMLElement());
+    ASSERT(currentElement()->hasTagName(formTag));
+    m_form = static_cast<HTMLFormElement*>(currentElement());
 }
 
@@ -308 +323 @@
 PassRefPtr<Element> HTMLConstructionSite::createHTMLElement(AtomicHTMLToken& token)
 {
-    RefPtr<Element> element = createElement(token, xhtmlNamespaceURI);
+    QualifiedName tagName(nullAtom, token.name(), xhtmlNamespaceURI);
+    // FIXME: This can't use HTMLConstructionSite::createElement because we
+    // have to pass the current form element.  We should rework form association
+    // to occur after construction to allow better code sharing here.
+    RefPtr<Element> element = HTMLElementFactory::createHTMLElement(tagName, m_document, form(), true);
+    element->setAttributeMap(token.takeAtributes(), m_fragmentScriptingPermission);
     ASSERT(element->isHTMLElement());
     return element.release();

trunk/WebCore/html/HTMLConstructionSite.h

@@ -56 +56 @@
     void insertHTMLHeadElement(AtomicHTMLToken&);
     void insertHTMLBodyElement(AtomicHTMLToken&);
+    void insertHTMLFormElement(AtomicHTMLToken&);
     void insertScriptElement(AtomicHTMLToken&);
     void insertTextNode(const String&);
@@ -84 +85 @@
     Element* head() const { return m_head.get(); }
 
-    Element* form() const { return m_form.get(); }
-    PassRefPtr<Element> takeForm() { return m_form.release(); }
-
-    void setForm(PassRefPtr<Element> form) { m_form = form; }
+    HTMLFormElement* form() const { return m_form.get(); }
+    PassRefPtr<HTMLFormElement> takeForm();
 
     class RedirectToFosterParentGuard : public Noncopyable {
@@ -129 +128 @@
     Document* m_document;
     RefPtr<Element> m_head;
-    RefPtr<Element> m_form;
+    RefPtr<HTMLFormElement> m_form;
     mutable HTMLElementStack m_openElements;
     mutable HTMLFormattingElementList m_activeFormattingElements;

trunk/WebCore/html/HTMLTreeBuilder.cpp

@@ -34 +34 @@
 #include "HTMLDocument.h"
 #include "HTMLElementFactory.h"
+#include "HTMLFormElement.h"
 #include "HTMLHtmlElement.h"
 #include "HTMLNames.h"
@@ -846 +847 @@
         }
         processFakePEndTagIfPInScope();
-        m_tree.insertHTMLElement(token);
-        m_tree.setForm(m_tree.currentElement());
+        m_tree.insertHTMLFormElement(token);
         return;
     }
@@ -1143 +1143 @@
         if (m_tree.form())
             return;
-        m_tree.insertSelfClosingHTMLElement(token);
+        // FIXME: This deviates from the spec:
+        //        http://www.w3.org/Bugs/Public/show_bug.cgi?id=10216
+        m_tree.insertHTMLFormElement(token);
+        m_tree.openElements()->pop();
         return;
     }