summaryrefslogtreecommitdiff
path: root/Source/WebCore/xml
diff options
context:
space:
mode:
Diffstat (limited to 'Source/WebCore/xml')
-rw-r--r--Source/WebCore/xml/XMLHttpRequest.cpp2
-rw-r--r--Source/WebCore/xml/XMLHttpRequest.idl8
-rw-r--r--Source/WebCore/xml/XMLHttpRequestException.idl6
-rw-r--r--Source/WebCore/xml/XMLHttpRequestProgressEvent.idl2
-rw-r--r--Source/WebCore/xml/XMLHttpRequestUpload.idl4
-rw-r--r--Source/WebCore/xml/XPathException.idl4
-rw-r--r--Source/WebCore/xml/XPathExpression.idl2
-rw-r--r--Source/WebCore/xml/XPathFunctions.cpp6
-rw-r--r--Source/WebCore/xml/XPathNodeSet.cpp8
-rw-r--r--Source/WebCore/xml/XPathResult.idl2
-rw-r--r--Source/WebCore/xml/XPathStep.cpp8
-rw-r--r--Source/WebCore/xml/parser/MarkupTokenBase.h2
-rw-r--r--Source/WebCore/xml/parser/XMLDocumentParserLibxml2.cpp6
-rw-r--r--Source/WebCore/xml/parser/XMLTreeBuilder.cpp6
14 files changed, 32 insertions, 34 deletions
diff --git a/Source/WebCore/xml/XMLHttpRequest.cpp b/Source/WebCore/xml/XMLHttpRequest.cpp
index 6be58aacf..41f0621ec 100644
--- a/Source/WebCore/xml/XMLHttpRequest.cpp
+++ b/Source/WebCore/xml/XMLHttpRequest.cpp
@@ -667,7 +667,7 @@ void XMLHttpRequest::createRequest(ExceptionCode& ec)
ResourceRequest request(m_url);
request.setHTTPMethod(m_method);
-#if PLATFORM(CHROMIUM)
+#if PLATFORM(CHROMIUM) || PLATFORM(BLACKBERRY)
request.setTargetType(ResourceRequest::TargetIsXHR);
#endif
diff --git a/Source/WebCore/xml/XMLHttpRequest.idl b/Source/WebCore/xml/XMLHttpRequest.idl
index 6fb4dfd72..b45baf2b1 100644
--- a/Source/WebCore/xml/XMLHttpRequest.idl
+++ b/Source/WebCore/xml/XMLHttpRequest.idl
@@ -33,9 +33,9 @@ module xml {
Constructor,
CallWith=ScriptExecutionContext,
V8CustomConstructor,
- CustomMarkFunction,
+ JSCustomMarkFunction,
EventTarget,
- NoStaticTables
+ JSNoStaticTables
] XMLHttpRequest {
// From XMLHttpRequestEventTarget
// event handler attributes
@@ -59,7 +59,7 @@ module xml {
readonly attribute unsigned short readyState;
// request
- attribute [Conditional=XHR_RESPONSE_BLOB, EnabledAtRuntime] boolean asBlob
+ attribute [Conditional=XHR_RESPONSE_BLOB, V8EnabledAtRuntime] boolean asBlob
setter raises(DOMException);
attribute boolean withCredentials
@@ -97,7 +97,7 @@ module xml {
getter raises(DOMException);
readonly attribute Document responseXML
getter raises(DOMException);
- readonly attribute [Conditional=XHR_RESPONSE_BLOB, EnabledAtRuntime] Blob responseBlob
+ readonly attribute [Conditional=XHR_RESPONSE_BLOB, V8EnabledAtRuntime] Blob responseBlob
getter raises(DOMException);
attribute DOMString responseType
diff --git a/Source/WebCore/xml/XMLHttpRequestException.idl b/Source/WebCore/xml/XMLHttpRequestException.idl
index ffea73248..c448155ab 100644
--- a/Source/WebCore/xml/XMLHttpRequestException.idl
+++ b/Source/WebCore/xml/XMLHttpRequestException.idl
@@ -29,8 +29,8 @@
module xml {
interface [
- NoStaticTables,
- DontCheckEnums
+ JSNoStaticTables,
+ DoNotCheckConstants
] XMLHttpRequestException {
readonly attribute unsigned short code;
@@ -39,7 +39,7 @@ module xml {
#if defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT
// Override in a Mozilla compatible format
- [DontEnum] DOMString toString();
+ [NotEnumerable] DOMString toString();
#endif
// XMLHttpRequestExceptionCode
diff --git a/Source/WebCore/xml/XMLHttpRequestProgressEvent.idl b/Source/WebCore/xml/XMLHttpRequestProgressEvent.idl
index 05c984e99..b1ca35522 100644
--- a/Source/WebCore/xml/XMLHttpRequestProgressEvent.idl
+++ b/Source/WebCore/xml/XMLHttpRequestProgressEvent.idl
@@ -26,7 +26,7 @@
module events {
interface [
- NoStaticTables
+ JSNoStaticTables
// We should also inherit from LSProgressEvent when the idl is added.
] XMLHttpRequestProgressEvent : ProgressEvent {
readonly attribute unsigned long long position;
diff --git a/Source/WebCore/xml/XMLHttpRequestUpload.idl b/Source/WebCore/xml/XMLHttpRequestUpload.idl
index 5f98cb77f..584c293b3 100644
--- a/Source/WebCore/xml/XMLHttpRequestUpload.idl
+++ b/Source/WebCore/xml/XMLHttpRequestUpload.idl
@@ -29,9 +29,9 @@
module xml {
interface [
- GenerateIsReachable=Impl,
+ JSGenerateIsReachable=Impl,
EventTarget,
- NoStaticTables
+ JSNoStaticTables
] XMLHttpRequestUpload {
// From XMLHttpRequestEventTarget
// event handler attributes
diff --git a/Source/WebCore/xml/XPathException.idl b/Source/WebCore/xml/XPathException.idl
index d43c57ab9..8196cbe5a 100644
--- a/Source/WebCore/xml/XPathException.idl
+++ b/Source/WebCore/xml/XPathException.idl
@@ -29,7 +29,7 @@
module xpath {
interface [
- DontCheckEnums
+ DoNotCheckConstants
] XPathException {
readonly attribute unsigned short code;
@@ -38,7 +38,7 @@ module xpath {
#if defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT
// Override in a Mozilla compatible format
- [DontEnum] DOMString toString();
+ [NotEnumerable] DOMString toString();
#endif
// XPathExceptionCode
diff --git a/Source/WebCore/xml/XPathExpression.idl b/Source/WebCore/xml/XPathExpression.idl
index 3dc26146a..add53cff4 100644
--- a/Source/WebCore/xml/XPathExpression.idl
+++ b/Source/WebCore/xml/XPathExpression.idl
@@ -21,7 +21,7 @@
module xpath {
interface XPathExpression {
- [OldStyleObjC] XPathResult evaluate(in [Optional=CallWithDefaultValue] Node contextNode,
+ [ObjCLegacyUnnamedParameters] XPathResult evaluate(in [Optional=CallWithDefaultValue] Node contextNode,
in [Optional=CallWithDefaultValue] unsigned short type,
in [Optional=CallWithDefaultValue] XPathResult inResult)
raises(DOMException);
diff --git a/Source/WebCore/xml/XPathFunctions.cpp b/Source/WebCore/xml/XPathFunctions.cpp
index 283583d78..154b67e92 100644
--- a/Source/WebCore/xml/XPathFunctions.cpp
+++ b/Source/WebCore/xml/XPathFunctions.cpp
@@ -29,7 +29,6 @@
#include "XPathFunctions.h"
#include "Element.h"
-#include "NamedNodeMap.h"
#include "ProcessingInstruction.h"
#include "TreeScope.h"
#include "XMLNames.h"
@@ -592,8 +591,9 @@ Value FunLang::evaluate() const
Node* node = evaluationContext().node.get();
while (node) {
if (node->isElementNode()) {
- if (NamedNodeMap* attributes = toElement(node)->updatedAttributes())
- languageAttribute = attributes->getAttributeItem(XMLNames::langAttr);
+ Element* element = toElement(node);
+ if (element->hasAttributes())
+ languageAttribute = element->getAttributeItem(XMLNames::langAttr);
}
if (languageAttribute)
break;
diff --git a/Source/WebCore/xml/XPathNodeSet.cpp b/Source/WebCore/xml/XPathNodeSet.cpp
index 8eefc573f..f4e4d9aff 100644
--- a/Source/WebCore/xml/XPathNodeSet.cpp
+++ b/Source/WebCore/xml/XPathNodeSet.cpp
@@ -213,13 +213,13 @@ void NodeSet::traversalSort() const
if (!containsAttributeNodes || !n->isElementNode())
continue;
- NamedNodeMap* attributes = toElement(n)->updatedAttributes();
- if (!attributes)
+ Element* element = toElement(n);
+ if (!element->hasAttributes())
continue;
- unsigned attributeCount = attributes->length();
+ unsigned attributeCount = element->attributeCount();
for (unsigned i = 0; i < attributeCount; ++i) {
- Attr* attribute = attributes->attributeItem(i)->attr();
+ Attr* attribute = element->attributeItem(i)->attr();
if (attribute && nodes.contains(attribute))
sortedNodes.append(attribute);
}
diff --git a/Source/WebCore/xml/XPathResult.idl b/Source/WebCore/xml/XPathResult.idl
index d87443ecc..cb5c92263 100644
--- a/Source/WebCore/xml/XPathResult.idl
+++ b/Source/WebCore/xml/XPathResult.idl
@@ -20,7 +20,7 @@
module xpath {
interface [
- CustomMarkFunction
+ JSCustomMarkFunction
] XPathResult {
const unsigned short ANY_TYPE = 0;
const unsigned short NUMBER_TYPE = 1;
diff --git a/Source/WebCore/xml/XPathStep.cpp b/Source/WebCore/xml/XPathStep.cpp
index 12f394f2c..ff7e685d9 100644
--- a/Source/WebCore/xml/XPathStep.cpp
+++ b/Source/WebCore/xml/XPathStep.cpp
@@ -31,7 +31,6 @@
#include "Attr.h"
#include "Document.h"
#include "Element.h"
-#include "NamedNodeMap.h"
#include "XMLNSNames.h"
#include "XPathParser.h"
#include "XPathUtil.h"
@@ -343,12 +342,11 @@ void Step::nodesInAxis(Node* context, NodeSet& nodes) const
return;
}
- NamedNodeMap* attrs = contextElement->updatedAttributes();
- if (!attrs)
+ if (!contextElement->hasAttributes())
return;
- for (unsigned i = 0; i < attrs->length(); ++i) {
- RefPtr<Attr> attr = attrs->attributeItem(i)->createAttrIfNeeded(static_cast<Element*>(context));
+ for (unsigned i = 0; i < contextElement->attributeCount(); ++i) {
+ RefPtr<Attr> attr = contextElement->attributeItem(i)->createAttrIfNeeded(static_cast<Element*>(context));
if (nodeMatches(attr.get(), AttributeAxis, m_nodeTest))
nodes.append(attr.release());
}
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)
View Lorry Controller Status