Imported WebKit commit e09a82039aa4273ab318b71122e92d8e5f233525 (http://svn.webkit.org/repository/webkit/trunk@107223)

3 files changed, 7 insertions, 7 deletions

diff --git a/Source/WebCore/xml/parser/MarkupTokenBase.h b/Source/WebCore/xml/parser/MarkupTokenBase.h
index 0e91913a6..7a30ed604 100644
--- a/Source/WebCore/xml/parser/MarkupTokenBase.h
+++ b/Source/WebCore/xml/parser/MarkupTokenBase.h
@@ -541,7 +541,7 @@ inline void AtomicMarkupTokenBase<Token>::initializeAttributes(const typename To
         ASSERT(attribute.m_valueRange.m_end);
 
         String value(attribute.m_value.data(), attribute.m_value.size());
-        m_attributes->insertAttribute(Attribute::createMapped(nameForAttribute(attribute), value), false);
+        m_attributes->insertAttribute(Attribute::create(nameForAttribute(attribute), value), false);
     }
 }
 
diff --git a/Source/WebCore/xml/parser/XMLDocumentParserLibxml2.cpp b/Source/WebCore/xml/parser/XMLDocumentParserLibxml2.cpp
index 4e1d49eef..3a36d98e1 100644
--- a/Source/WebCore/xml/parser/XMLDocumentParserLibxml2.cpp
+++ b/Source/WebCore/xml/parser/XMLDocumentParserLibxml2.cpp
@@ -599,9 +599,9 @@ XMLDocumentParser::XMLDocumentParser(DocumentFragment* fragment, Element* parent
 
     for (; !elemStack.isEmpty(); elemStack.removeLast()) {
         Element* element = elemStack.last();
-        if (NamedNodeMap* attrs = element->updatedAttributes()) {
-            for (unsigned i = 0; i < attrs->length(); i++) {
-                Attribute* attr = attrs->attributeItem(i);
+        if (element->hasAttributes()) {
+            for (unsigned i = 0; i < element->attributeCount(); i++) {
+                Attribute* attr = element->attributeItem(i);
                 if (attr->localName() == xmlnsAtom)
                     m_defaultNamespaceURI = attr->value();
                 else if (attr->prefix() == xmlnsAtom)
diff --git a/Source/WebCore/xml/parser/XMLTreeBuilder.cpp b/Source/WebCore/xml/parser/XMLTreeBuilder.cpp
index 8de1a0817..0c2b2d6a0 100644
--- a/Source/WebCore/xml/parser/XMLTreeBuilder.cpp
+++ b/Source/WebCore/xml/parser/XMLTreeBuilder.cpp
@@ -80,9 +80,9 @@ XMLTreeBuilder::XMLTreeBuilder(NewXMLDocumentParser* parser, DocumentFragment* f
 
     for (Element* element; !nodeStack.isEmpty(); nodeStack.removeLast()) {
         element = nodeStack.last();
-        if (NamedNodeMap* attrs = element->updatedAttributes()) {
-            for (size_t i = 0; i < attrs->length(); ++i) {
-                Attribute* attr = attrs->attributeItem(i);
+        if (element->hasAttributes()) {
+            for (size_t i = 0; i < element->attributeCount(); ++i) {
+                Attribute* attr = element->attributeItem(i);
                 if (attr->localName() == xmlnsAtom)
                     stackItem.setNamespaceURI(attr->value());
                 else if (attr->prefix() == xmlnsAtom)