Merge webkit.org at r61121: Initial merge by git.

Change-Id: Icd6db395c62285be384d137164d95d7466c98760

1 files changed, 16 insertions, 16 deletions

diff --git a/WebCore/loader/TextDocument.cpp b/WebCore/loader/TextDocument.cpp
index a3d7061..68335a7 100644
--- a/WebCore/loader/TextDocument.cpp
+++ b/WebCore/loader/TextDocument.cpp
@@ -30,7 +30,7 @@
 #include "HTMLViewSourceDocument.h"
 #include "SegmentedString.h"
 #include "Text.h"
-#include "XMLTokenizer.h"
+#include "XMLDocumentParser.h"
 
 using namespace std;
 
@@ -38,11 +38,11 @@ namespace WebCore {
 
 using namespace HTMLNames;
 
-class TextTokenizer : public Tokenizer {
+class TextDocumentParser : public DocumentParser {
 public:
-    TextTokenizer(Document*);
-    virtual ~TextTokenizer();
-    TextTokenizer(HTMLViewSourceDocument*);
+    TextDocumentParser(Document*);
+    virtual ~TextDocumentParser();
+    TextDocumentParser(HTMLViewSourceDocument*);
 
     virtual void write(const SegmentedString&, bool appendData);
     virtual void finish();
@@ -71,7 +71,7 @@ private:
     UChar* m_dest;
 };
 
-TextTokenizer::TextTokenizer(Document* doc)
+TextDocumentParser::TextDocumentParser(Document* doc)
     : m_doc(doc)
     , m_preElement(0)
     , m_skipLF(false)
@@ -82,8 +82,8 @@ TextTokenizer::TextTokenizer(Document* doc)
     m_dest = m_buffer;
 }    
 
-TextTokenizer::TextTokenizer(HTMLViewSourceDocument* doc)
-    : Tokenizer(true)
+TextDocumentParser::TextDocumentParser(HTMLViewSourceDocument* doc)
+    : DocumentParser(true)
     , m_doc(doc)
     , m_preElement(0)
     , m_skipLF(false)
@@ -94,13 +94,13 @@ TextTokenizer::TextTokenizer(HTMLViewSourceDocument* doc)
     m_dest = m_buffer;
 }
 
-TextTokenizer::~TextTokenizer()
+TextDocumentParser::~TextDocumentParser()
 {
     // finish() should have been called to prevent any leaks
     ASSERT(!m_buffer);
 }
 
-void TextTokenizer::write(const SegmentedString& s, bool)
+void TextDocumentParser::write(const SegmentedString& s, bool)
 {
     ExceptionCode ec;
 
@@ -160,7 +160,7 @@ void TextTokenizer::write(const SegmentedString& s, bool)
     }
 }
 
-void TextTokenizer::finish()
+void TextDocumentParser::finish()
 {
     if (!m_preElement)
         write(SegmentedString(), true); // Create document structure for an empty text document.
@@ -172,7 +172,7 @@ void TextTokenizer::finish()
     m_doc->finishedParsing();
 }
 
-bool TextTokenizer::isWaitingForScripts() const
+bool TextDocumentParser::isWaitingForScripts() const
 {
     // A text document is never waiting for scripts
     return false;
@@ -183,14 +183,14 @@ TextDocument::TextDocument(Frame* frame)
 {
 }
 
-Tokenizer* TextDocument::createTokenizer()
+DocumentParser* TextDocument::createParser()
 {
-    return new TextTokenizer(this);
+    return new TextDocumentParser(this);
 }
 
-Tokenizer* createTextTokenizer(HTMLViewSourceDocument* document)
+DocumentParser* createTextDocumentParser(HTMLViewSourceDocument* document)
 {
-    return new TextTokenizer(document);
+    return new TextDocumentParser(document);
 }
 
 }