4 files changed, 10 insertions, 10 deletions
diff --git a/WebCore/wml/WMLDocument.cpp b/WebCore/wml/WMLDocument.cpp
index 44f4e2b..ba4bb57 100644
--- a/WebCore/wml/WMLDocument.cpp
+++ b/WebCore/wml/WMLDocument.cpp
@@ -26,7 +26,7 @@
 #include "BackForwardList.h"
 #include "Frame.h"
 #include "Page.h"
-#include "Tokenizer.h"
+#include "DocumentParser.h"
 #include "WMLCardElement.h"
 #include "WMLErrorHandling.h"
 #include "WMLPageState.h"
@@ -47,8 +47,8 @@ WMLDocument::~WMLDocument()
 
 void WMLDocument::finishedParsing()
 {
-    if (Tokenizer* tokenizer = this->tokenizer()) {
-        if (!tokenizer->wellFormed()) {
+    if (DocumentParser* parser = this->parser()) {
+        if (!parser->wellFormed()) {
             Document::finishedParsing();
             return;
         }
diff --git a/WebCore/wml/WMLElement.cpp b/WebCore/wml/WMLElement.cpp
index dbe55a9..f359236 100644
--- a/WebCore/wml/WMLElement.cpp
+++ b/WebCore/wml/WMLElement.cpp
@@ -60,7 +60,7 @@ bool WMLElement::mapToEntry(const QualifiedName& attrName, MappedAttributeEntry&
     
 void WMLElement::parseMappedAttribute(Attribute* attr)
 {
-    if (attr->name() == idAttributeName()
+    if (isIdAttributeName(attr->name())
         || attr->name() == HTMLNames::classAttr
         || attr->name() == HTMLNames::styleAttr)
         return StyledElement::parseMappedAttribute(attr);
diff --git a/WebCore/wml/WMLErrorHandling.cpp b/WebCore/wml/WMLErrorHandling.cpp
index 6184772..8532822 100644
--- a/WebCore/wml/WMLErrorHandling.cpp
+++ b/WebCore/wml/WMLErrorHandling.cpp
@@ -27,7 +27,7 @@
 #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)
diff --git a/WebCore/wml/WMLTemplateElement.cpp b/WebCore/wml/WMLTemplateElement.cpp
index 2537c3b..27c828c 100644
--- a/WebCore/wml/WMLTemplateElement.cpp
+++ b/WebCore/wml/WMLTemplateElement.cpp
@@ -98,7 +98,7 @@ void WMLTemplateElement::registerTemplatesInDocument(Document* doc)
         return;
 
     // Only one template element should be allowed in a document
-    // Calling setTemplateElement() twice on a WMLCardElement, will result in a tokenizer error.
+    // Calling setTemplateElement() twice on a WMLCardElement, will result in a parser error.
     for (unsigned i = 0; i < length; ++i) {
         WMLTemplateElement* temp = static_cast<WMLTemplateElement*>(nodeList->item(i));