Changeset 93460 in webkit

Timestamp:

Aug 19, 2011 5:45:52 PM (13 years ago)

Author:

jpfau@apple.com

Message:

New XML parser: text nodes outside of root element not created for document fragments
​https://bugs.webkit.org/show_bug.cgi?id=66604

When intializing a fragment parser, declare that the first element has been seen. Also, flush the text nodes when finishing parsing a document.

Reviewed by Darin Adler.

• xml/parser/NewXMLDocumentParser.cpp:

(WebCore::NewXMLDocumentParser::finish):

• xml/parser/XMLTreeBuilder.cpp:

(WebCore::XMLTreeBuilder::XMLTreeBuilder):
(WebCore::XMLTreeBuilder::processToken):
(WebCore::XMLTreeBuilder::finish):

• xml/parser/XMLTreeBuilder.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• xml/parser/NewXMLDocumentParser.cpp (modified) (1 diff)
• xml/parser/XMLTreeBuilder.cpp (modified) (3 diffs)
• xml/parser/XMLTreeBuilder.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-08-19  Jeffrey Pfau  <jpfau@apple.com>
+
+        New XML parser: text nodes outside of root element not created for document fragments
+        https://bugs.webkit.org/show_bug.cgi?id=66604
+
+        When intializing a fragment parser, declare that the first element has been seen. Also, flush the text nodes when finishing parsing a document.
+
+        Reviewed by Darin Adler.
+
+        * xml/parser/NewXMLDocumentParser.cpp:
+        (WebCore::NewXMLDocumentParser::finish):
+        * xml/parser/XMLTreeBuilder.cpp:
+        (WebCore::XMLTreeBuilder::XMLTreeBuilder):
+        (WebCore::XMLTreeBuilder::processToken):
+        (WebCore::XMLTreeBuilder::finish):
+        * xml/parser/XMLTreeBuilder.h:
+
 2011-08-19  Jeff Miller  <jeffm@apple.com>
 

trunk/Source/WebCore/xml/parser/NewXMLDocumentParser.cpp

@@ -145 +145 @@
         return;
 
+    m_treeBuilder->finish();
+
     m_finishWasCalled = true;
     if (isParsing())

trunk/Source/WebCore/xml/parser/XMLTreeBuilder.cpp

@@ -48 +48 @@
     , m_parser(parser)
     , m_isXHTML(false)
+    , m_sawFirstElement(false)
 {
     m_currentNodeStack.append(NodeStackItem(document));
@@ -56 +57 @@
     , m_parser(parser)
     , m_isXHTML(false)
+    , m_sawFirstElement(true)
 {
     NodeStackItem stackItem(fragment);
@@ -129 +131 @@
         break;
     case XMLTokenTypes::EndOfFile:
-        return;
-    }
+        exitText();
+        return;
+    }
+}
+
+void XMLTreeBuilder::finish()
+{
+    exitText();
 }
 

trunk/Source/WebCore/xml/parser/XMLTreeBuilder.h

@@ -54 +54 @@
 
     void processToken(const AtomicXMLToken&);
+    void finish();
 
 private: