am b34d9d68: merge from open-source master

[android-x86/external-webkit.git] / WebCore / wml / WMLErrorHandling.cpp

diff --git a/WebCore/wml/WMLErrorHandling.cpp b/WebCore/wml/WMLErrorHandling.cpp
index d62ccb7..8532822 100644 (file)
--- a/WebCore/wml/WMLErrorHandling.cpp
+++ b/WebCore/wml/WMLErrorHandling.cpp
@@ -24,11 +24,11 @@
 #include "WMLErrorHandling.h"
 
 #include "Console.h"
-#include "CString.h"
 #include "Frame.h"
 #include "Document.h"
 #include "DOMWindow.h"
-#include "XMLTokenizer.h"
+#include "XMLDocumentParser.h"
+#include <wtf/text/CString.h>
 
 namespace WebCore {
 
@@ -38,17 +38,17 @@ void reportWMLError(Document* doc, WMLErrorCode error)
         return;
 
     String errorMessage = errorMessageForErrorCode(error);
-    XMLTokenizer* tokenizer = static_cast<XMLTokenizer*>(doc->tokenizer());
-    if (tokenizer && error != WMLErrorDeckNotAccessible) {
+    XMLDocumentParser* parser = static_cast<XMLDocumentParser*>(doc->parser());
+    if (parser && error != WMLErrorDeckNotAccessible) {
         // Some errors are reported as result of an insertedIntoDocument() call.
         // If this happened, parsing has been stopped, and the document fragment
         // is wrapped in a XHTML error document. That means insertedIntoDocument()
         // will be called again - do NOT report the error twice, that would result
         // in an infinite error reporting loop.
-        if (!tokenizer->wellFormed())
+        if (!parser->wellFormed())
             return;
 
-        tokenizer->handleError(XMLTokenizer::fatal, errorMessage.latin1().data(), tokenizer->lineNumber(), tokenizer->columnNumber());
+        parser->handleError(XMLDocumentParser::fatal, errorMessage.latin1().data(), parser->lineNumber(), parser->columnNumber());
     } else {
         Frame* frame = doc->frame();
         if (!frame)