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

Change-Id: Icd6db395c62285be384d137164d95d7466c98760

1 files changed, 3 insertions, 3 deletions

diff --git a/WebCore/loader/ImageDocument.cpp b/WebCore/loader/ImageDocument.cpp
index 69aaed1..8ab412f 100644
--- a/WebCore/loader/ImageDocument.cpp
+++ b/WebCore/loader/ImageDocument.cpp
@@ -44,7 +44,7 @@
 #include "SegmentedString.h"
 #include "Settings.h"
 #include "Text.h"
-#include "XMLTokenizer.h"
+#include "XMLDocumentParser.h"
 
 using std::min;
 
@@ -76,7 +76,7 @@ private:
     ImageDocument* m_doc;
 };
     
-class ImageTokenizer : public Tokenizer {
+class ImageTokenizer : public DocumentParser {
 public:
     ImageTokenizer(ImageDocument* doc) : m_doc(doc) {}
 
@@ -192,7 +192,7 @@ ImageDocument::ImageDocument(Frame* frame)
     setParseMode(Compat);
 }
     
-Tokenizer* ImageDocument::createTokenizer()
+DocumentParser* ImageDocument::createParser()
 {
     return new ImageTokenizer(this);
 }