summaryrefslogtreecommitdiff
path: root/Source/WebCore/xml/parser
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@nokia.com>2012-03-12 14:11:15 +0100
committerSimon Hausmann <simon.hausmann@nokia.com>2012-03-12 14:11:15 +0100
commitdd91e772430dc294e3bf478c119ef8d43c0a3358 (patch)
tree6f33ce4d5872a5691e0291eb45bf6ab373a5f567 /Source/WebCore/xml/parser
parentad0d549d4cc13433f77c1ac8f0ab379c83d93f28 (diff)
downloadqtwebkit-dd91e772430dc294e3bf478c119ef8d43c0a3358.tar.gz
Imported WebKit commit 3db4eb1820ac8fb03065d7ea73a4d9db1e8fea1a (http://svn.webkit.org/repository/webkit/trunk@110422)
This includes build fixes for the latest qtbase/qtdeclarative as well as the final QML2 API.
Diffstat (limited to 'Source/WebCore/xml/parser')
-rw-r--r--Source/WebCore/xml/parser/MarkupTokenBase.h14
-rw-r--r--Source/WebCore/xml/parser/XMLToken.h2
-rw-r--r--Source/WebCore/xml/parser/XMLTreeBuilder.cpp4
3 files changed, 10 insertions, 10 deletions
diff --git a/Source/WebCore/xml/parser/MarkupTokenBase.h b/Source/WebCore/xml/parser/MarkupTokenBase.h
index 986538b8d..2a0aa3050 100644
--- a/Source/WebCore/xml/parser/MarkupTokenBase.h
+++ b/Source/WebCore/xml/parser/MarkupTokenBase.h
@@ -27,7 +27,7 @@
#ifndef MarkupTokenBase_h
#define MarkupTokenBase_h
-#include "NamedNodeMap.h"
+#include "ElementAttributeData.h"
#include <wtf/PassOwnPtr.h>
#include <wtf/Vector.h>
@@ -410,7 +410,7 @@ public:
}
}
- AtomicMarkupTokenBase(typename Token::Type::Type type, AtomicString name, PassOwnPtr<NamedNodeMap> attributes = nullptr)
+ AtomicMarkupTokenBase(typename Token::Type::Type type, AtomicString name, PassOwnPtr<AttributeVector> attributes = nullptr)
: m_type(type)
, m_name(name)
, m_attributes(attributes)
@@ -446,13 +446,13 @@ public:
return m_attributes->getAttributeItem(attributeName);
}
- NamedNodeMap* attributes() const
+ AttributeVector* attributes() const
{
ASSERT(usesAttributes());
return m_attributes.get();
}
- PassOwnPtr<NamedNodeMap> takeAttributes()
+ PassOwnPtr<AttributeVector> takeAttributes()
{
ASSERT(usesAttributes());
return m_attributes.release();
@@ -516,7 +516,7 @@ protected:
// For StartTag and EndTag
bool m_selfClosing;
- OwnPtr<NamedNodeMap> m_attributes;
+ OwnPtr<AttributeVector> m_attributes;
};
template<typename Token>
@@ -526,7 +526,7 @@ inline void AtomicMarkupTokenBase<Token>::initializeAttributes(const typename To
if (!size)
return;
- m_attributes = NamedNodeMap::create();
+ m_attributes = AttributeVector::create();
m_attributes->reserveInitialCapacity(size);
for (size_t i = 0; i < size; ++i) {
const typename Token::Attribute& attribute = attributes[i];
@@ -541,7 +541,7 @@ inline void AtomicMarkupTokenBase<Token>::initializeAttributes(const typename To
ASSERT(attribute.m_valueRange.m_end);
AtomicString value(attribute.m_value.data(), attribute.m_value.size());
- m_attributes->insertAttribute(Attribute::create(nameForAttribute(attribute), value), false);
+ m_attributes->insertAttribute(Attribute::create(nameForAttribute(attribute), value));
}
}
diff --git a/Source/WebCore/xml/parser/XMLToken.h b/Source/WebCore/xml/parser/XMLToken.h
index d1bdc0e6b..1ed16ca9b 100644
--- a/Source/WebCore/xml/parser/XMLToken.h
+++ b/Source/WebCore/xml/parser/XMLToken.h
@@ -431,7 +431,7 @@ public:
}
}
- AtomicXMLToken(XMLTokenTypes::Type type, AtomicString name, PassOwnPtr<NamedNodeMap> attributes = nullptr)
+ AtomicXMLToken(XMLTokenTypes::Type type, AtomicString name, PassOwnPtr<AttributeVector> attributes = nullptr)
: AtomicMarkupTokenBase<XMLToken>(type, name, attributes)
{
}
diff --git a/Source/WebCore/xml/parser/XMLTreeBuilder.cpp b/Source/WebCore/xml/parser/XMLTreeBuilder.cpp
index 0c2b2d6a0..81793ed6d 100644
--- a/Source/WebCore/xml/parser/XMLTreeBuilder.cpp
+++ b/Source/WebCore/xml/parser/XMLTreeBuilder.cpp
@@ -301,7 +301,7 @@ void XMLTreeBuilder::processNamespaces(const AtomicXMLToken& token, NodeStackIte
if (!token.attributes())
return;
- for (size_t i = 0; i < token.attributes()->length(); ++i) {
+ for (size_t i = 0; i < token.attributes()->size(); ++i) {
Attribute* attribute = token.attributes()->attributeItem(i);
if (attribute->name().prefix() == xmlnsAtom)
stackItem.setNamespaceURI(attribute->name().localName(), attribute->value());
@@ -315,7 +315,7 @@ void XMLTreeBuilder::processAttributes(const AtomicXMLToken& token, NodeStackIte
if (!token.attributes())
return;
- for (size_t i = 0; i < token.attributes()->length(); ++i) {
+ for (size_t i = 0; i < token.attributes()->size(); ++i) {
Attribute* attribute = token.attributes()->attributeItem(i);
ExceptionCode ec = 0;
if (attribute->name().prefix() == xmlnsAtom)