summaryrefslogtreecommitdiffstats
path: root/WebCore/xml
diff options
context:
space:
mode:
Diffstat (limited to 'WebCore/xml')
-rw-r--r--WebCore/xml/XMLHttpRequest.h2
-rw-r--r--WebCore/xml/XMLHttpRequestUpload.cpp2
-rw-r--r--WebCore/xml/XMLHttpRequestUpload.h2
-rw-r--r--WebCore/xml/XPathExpressionNode.h2
-rw-r--r--WebCore/xml/XPathFunctions.cpp18
-rw-r--r--WebCore/xml/XPathNamespace.h2
-rw-r--r--WebCore/xml/XPathParser.cpp6
-rw-r--r--WebCore/xml/XSLTProcessor.cpp6
-rw-r--r--WebCore/xml/XSLTProcessor.h2
9 files changed, 21 insertions, 21 deletions
diff --git a/WebCore/xml/XMLHttpRequest.h b/WebCore/xml/XMLHttpRequest.h
index 363fdf8..2947b46 100644
--- a/WebCore/xml/XMLHttpRequest.h
+++ b/WebCore/xml/XMLHttpRequest.h
@@ -21,7 +21,6 @@
#define XMLHttpRequest_h
#include "ActiveDOMObject.h"
-#include "AtomicStringHash.h"
#include "EventListener.h"
#include "EventNames.h"
#include "EventTarget.h"
@@ -31,6 +30,7 @@
#include "ThreadableLoaderClient.h"
#include "XMLHttpRequestProgressEventThrottle.h"
#include <wtf/OwnPtr.h>
+#include <wtf/text/AtomicStringHash.h>
namespace WebCore {
diff --git a/WebCore/xml/XMLHttpRequestUpload.cpp b/WebCore/xml/XMLHttpRequestUpload.cpp
index 9d0fafc..739082d 100644
--- a/WebCore/xml/XMLHttpRequestUpload.cpp
+++ b/WebCore/xml/XMLHttpRequestUpload.cpp
@@ -26,13 +26,13 @@
#include "config.h"
#include "XMLHttpRequestUpload.h"
-#include "AtomicString.h"
#include "Event.h"
#include "EventException.h"
#include "EventNames.h"
#include "XMLHttpRequest.h"
#include "XMLHttpRequestProgressEvent.h"
#include <wtf/Assertions.h>
+#include <wtf/text/AtomicString.h>
namespace WebCore {
diff --git a/WebCore/xml/XMLHttpRequestUpload.h b/WebCore/xml/XMLHttpRequestUpload.h
index 7a605fb..984d86a 100644
--- a/WebCore/xml/XMLHttpRequestUpload.h
+++ b/WebCore/xml/XMLHttpRequestUpload.h
@@ -26,7 +26,6 @@
#ifndef XMLHttpRequestUpload_h
#define XMLHttpRequestUpload_h
-#include "AtomicStringHash.h"
#include "EventListener.h"
#include "EventNames.h"
#include "EventTarget.h"
@@ -36,6 +35,7 @@
#include <wtf/RefPtr.h>
#include <wtf/PassRefPtr.h>
#include <wtf/Vector.h>
+#include <wtf/text/AtomicStringHash.h>
namespace WebCore {
diff --git a/WebCore/xml/XPathExpressionNode.h b/WebCore/xml/XPathExpressionNode.h
index 38070b9..c04d45b 100644
--- a/WebCore/xml/XPathExpressionNode.h
+++ b/WebCore/xml/XPathExpressionNode.h
@@ -29,11 +29,11 @@
#if ENABLE(XPATH)
-#include "StringHash.h"
#include "Node.h"
#include "XPathValue.h"
#include <wtf/HashMap.h>
#include <wtf/Vector.h>
+#include <wtf/text/StringHash.h>
namespace WebCore {
diff --git a/WebCore/xml/XPathFunctions.cpp b/WebCore/xml/XPathFunctions.cpp
index 41bf795..8b4e720 100644
--- a/WebCore/xml/XPathFunctions.cpp
+++ b/WebCore/xml/XPathFunctions.cpp
@@ -477,9 +477,9 @@ Value FunSubstringBefore::evaluate() const
if (s2.isEmpty())
return "";
- int i = s1.find(s2);
+ size_t i = s1.find(s2);
- if (i == -1)
+ if (i == notFound)
return "";
return s1.left(i);
@@ -490,8 +490,8 @@ Value FunSubstringAfter::evaluate() const
String s1 = arg(0)->evaluate().toString();
String s2 = arg(1)->evaluate().toString();
- int i = s1.find(s2);
- if (i == -1)
+ size_t i = s1.find(s2);
+ if (i == notFound)
return "";
return s1.substring(i + s2.length());
@@ -556,11 +556,11 @@ Value FunTranslate::evaluate() const
// FIXME: Building a String a character at a time is quite slow.
for (unsigned i1 = 0; i1 < s1.length(); ++i1) {
UChar ch = s1[i1];
- int i2 = s2.find(ch);
+ size_t i2 = s2.find(ch);
- if (i2 == -1)
+ if (i2 == notFound)
newString += String(&ch, 1);
- else if ((unsigned)i2 < s3.length()) {
+ else if (i2 < s3.length()) {
UChar c2 = s3[i2];
newString += String(&c2, 1);
}
@@ -608,8 +608,8 @@ Value FunLang::evaluate() const
return true;
// Remove suffixes one by one.
- int index = langValue.reverseFind('-');
- if (index == -1)
+ size_t index = langValue.reverseFind('-');
+ if (index == notFound)
break;
langValue = langValue.left(index);
}
diff --git a/WebCore/xml/XPathNamespace.h b/WebCore/xml/XPathNamespace.h
index 996cb9a..c34eeef 100644
--- a/WebCore/xml/XPathNamespace.h
+++ b/WebCore/xml/XPathNamespace.h
@@ -29,8 +29,8 @@
#if ENABLE(XPATH)
-#include "AtomicString.h"
#include "Node.h"
+#include <wtf/text/AtomicString.h>
namespace WebCore {
diff --git a/WebCore/xml/XPathParser.cpp b/WebCore/xml/XPathParser.cpp
index 5501df1..20e7590 100644
--- a/WebCore/xml/XPathParser.cpp
+++ b/WebCore/xml/XPathParser.cpp
@@ -31,12 +31,12 @@
#if ENABLE(XPATH)
#include "ExceptionCode.h"
-#include "StringHash.h"
#include "XPathEvaluator.h"
#include "XPathException.h"
#include "XPathNSResolver.h"
#include "XPathStep.h"
#include <wtf/StdLibExtras.h>
+#include <wtf/text/StringHash.h>
int xpathyyparse(void*);
@@ -453,8 +453,8 @@ int Parser::lex(void* data)
bool Parser::expandQName(const String& qName, String& localName, String& namespaceURI)
{
- int colon = qName.find(':');
- if (colon >= 0) {
+ size_t colon = qName.find(':');
+ if (colon != notFound) {
if (!m_resolver)
return false;
namespaceURI = m_resolver->lookupNamespaceURI(qName.left(colon));
diff --git a/WebCore/xml/XSLTProcessor.cpp b/WebCore/xml/XSLTProcessor.cpp
index 7e07ee3..6e149a1 100644
--- a/WebCore/xml/XSLTProcessor.cpp
+++ b/WebCore/xml/XSLTProcessor.cpp
@@ -100,11 +100,11 @@ static inline RefPtr<DocumentFragment> createFragmentFromSource(const String& so
RefPtr<DocumentFragment> fragment = outputDoc->createDocumentFragment();
if (sourceMIMEType == "text/html")
- fragment->parseHTML(sourceString, outputDoc->documentElement());
+ fragment->parseHTML(sourceString, 0);
else if (sourceMIMEType == "text/plain")
- fragment->legacyParserAddChild(Text::create(outputDoc, sourceString));
+ fragment->parserAddChild(Text::create(outputDoc, sourceString));
else {
- bool successfulParse = fragment->parseXML(sourceString, outputDoc->documentElement());
+ bool successfulParse = fragment->parseXML(sourceString, 0);
if (!successfulParse)
return 0;
}
diff --git a/WebCore/xml/XSLTProcessor.h b/WebCore/xml/XSLTProcessor.h
index 9b91017..5be6b17 100644
--- a/WebCore/xml/XSLTProcessor.h
+++ b/WebCore/xml/XSLTProcessor.h
@@ -26,9 +26,9 @@
#if ENABLE(XSLT)
#include "Node.h"
-#include "StringHash.h"
#include "XSLStyleSheet.h"
#include <wtf/HashMap.h>
+#include <wtf/text/StringHash.h>
#if !USE(QXMLQUERY)
#include <libxml/parserInternals.h>