Changeset 109373 in webkit

Timestamp:

Mar 1, 2012, 11:14:35 AM (15 years ago)

Author:

cevans@google.com

Message:

Merge 108311
BUG=114911
Review URL: ​https://chromiumcodereview.appspot.com/9568022

Location:

branches/chromium/963

Files:

• LayoutTests/html5lib/resources/webkit02.dat (modified) (1 diff)
• Source/WebCore/html/parser/HTMLTreeBuilder.cpp (modified) (1 diff)

branches/chromium/963/LayoutTests/html5lib/resources/webkit02.dat

@@ -125 +125 @@
 |   <em>
 |     <b>
+
+#data
+<isindex action="x">
+#errors
+#document-fragment
+table
+#document
+| <form>
+|   action="x"
+| <hr>
+| <label>
+|   "This is a searchable index. Enter search keywords: "
+|   <input>
+|     name="isindex"
+| <hr>

branches/chromium/963/Source/WebCore/html/parser/HTMLTreeBuilder.cpp

@@ -567 +567 @@
     processFakeStartTag(formTag);
     RefPtr<Attribute> actionAttribute = token.getAttributeItem(actionAttr);
-    if (actionAttribute) {
-        ASSERT(m_tree.currentElement()->hasTagName(formTag));
-        m_tree.currentElement()->setAttribute(actionAttr, actionAttribute->value());
-    }
+    if (actionAttribute)
+        m_tree.form()->setAttribute(actionAttr, actionAttribute->value());
     processFakeStartTag(hrTag);
     processFakeStartTag(labelTag);