Bug 540574 - Make the HTML5 parser break out of doc update on <body> and remove trailing white space from test_bug386782.html. r=bnewman.

2010-02-22 14:17:33 +02:00
parent c381937041
commit 898d60c4ea
5 changed files with 63 additions and 18 deletions
--- a/parser/html/nsHtml5TreeOperation.cpp
+++ b/parser/html/nsHtml5TreeOperation.cpp
@@ -424,6 +424,14 @@ nsHtml5TreeOperation::Perform(nsHtml5TreeOpExecutor* aBuilder,
          newContent->AppendChildTo(optionElt, PR_FALSE);
          newContent->DoneAddingChildren(PR_FALSE);
        }
+      } else if (name == nsHtml5Atoms::frameset && ns == kNameSpaceID_XHTML) {
+        nsIDocument* doc = aBuilder->GetDocument();
+        nsCOMPtr<nsIHTMLDocument> htmlDocument = do_QueryInterface(doc);
+        if (htmlDocument) {
+          // It seems harmless to call this multiple times, since this 
+          // is a simple field setter
+          htmlDocument->SetIsFrameset(PR_TRUE);
+        }
      }

      if (!attributes) {