Bug 614241 - Make a late <body> start tag set frameset-ok to "not ok". rs=jonas, a=blocking2.0-betaN.

2010-12-09 11:27:58 +02:00
parent befa73c918
commit 1c863f5f7b
3 changed files with 19 additions and 1 deletions
--- a/parser/html/nsHtml5TreeBuilder.cpp
+++ b/parser/html/nsHtml5TreeBuilder.cpp
@@ -919,7 +919,16 @@ nsHtml5TreeBuilder::startTag(nsHtml5ElementName* elementName, nsHtml5HtmlAttribu
              NS_HTML5_BREAK(inbodyloop);
            }
            case NS_HTML5TREE_BUILDER_BODY: {
+              if (!currentPtr || stack[1]->getGroup() != NS_HTML5TREE_BUILDER_BODY) {

+
+                NS_HTML5_BREAK(starttagloop);
+              }
+
+              framesetOk = PR_FALSE;
+              if (mode == NS_HTML5TREE_BUILDER_FRAMESET_OK) {
+                mode = NS_HTML5TREE_BUILDER_IN_BODY;
+              }
              if (addAttributesToBody(attributes)) {
                attributes = nsnull;
              }