| Index: Source/core/xml/parser/XMLDocumentParser.cpp
|
| diff --git a/Source/core/xml/parser/XMLDocumentParser.cpp b/Source/core/xml/parser/XMLDocumentParser.cpp
|
| index 879afb0c5ce2761565c0e42e4b1f5393c00f1802..ebdaa8a18ffd90629d6b12403599a8525fa2653d 100644
|
| --- a/Source/core/xml/parser/XMLDocumentParser.cpp
|
| +++ b/Source/core/xml/parser/XMLDocumentParser.cpp
|
| @@ -72,8 +72,6 @@
|
| #include "wtf/Vector.h"
|
| #include "wtf/unicode/UTF8.h"
|
|
|
| -using namespace std;
|
| -
|
| namespace WebCore {
|
|
|
| using namespace HTMLNames;
|
| @@ -81,7 +79,7 @@ using namespace HTMLNames;
|
| // FIXME: HTMLConstructionSite has a limit of 512, should these match?
|
| static const unsigned maxXMLTreeDepth = 5000;
|
|
|
| -static inline String toString(const xmlChar* string, size_t length)
|
| +static inline String toString(const xmlChar* string, std::size_t length)
|
| {
|
| return String::fromUTF8(reinterpret_cast<const char*>(string), length);
|
| }
|
| @@ -91,7 +89,7 @@ static inline String toString(const xmlChar* string)
|
| return String::fromUTF8(reinterpret_cast<const char*>(string));
|
| }
|
|
|
| -static inline AtomicString toAtomicString(const xmlChar* string, size_t length)
|
| +static inline AtomicString toAtomicString(const xmlChar* string, std::size_t length)
|
| {
|
| return AtomicString::fromUTF8(reinterpret_cast<const char*>(string), length);
|
| }
|
| @@ -333,7 +331,7 @@ void XMLDocumentParser::clearCurrentNodeStack()
|
|
|
| if (m_currentNodeStack.size()) { // Aborted parsing.
|
| #if !ENABLE(OILPAN)
|
| - for (size_t i = m_currentNodeStack.size() - 1; i != 0; --i)
|
| + for (std::size_t i = m_currentNodeStack.size() - 1; i != 0; --i)
|
| m_currentNodeStack[i]->deref();
|
| if (m_currentNodeStack[0] && m_currentNodeStack[0] != document())
|
| m_currentNodeStack[0]->deref();
|
| @@ -1309,7 +1307,7 @@ static xmlEntityPtr sharedXHTMLEntity()
|
| return &entity;
|
| }
|
|
|
| -static size_t convertUTF16EntityToUTF8(const UChar* utf16Entity, size_t numberOfCodeUnits, char* target, size_t targetSize)
|
| +static std::size_t convertUTF16EntityToUTF8(const UChar* utf16Entity, std::size_t numberOfCodeUnits, char* target, std::size_t targetSize)
|
| {
|
| const char* originalTarget = target;
|
| WTF::Unicode::ConversionResult conversionResult = WTF::Unicode::convertUTF16ToUTF8(&utf16Entity,
|
| @@ -1326,12 +1324,12 @@ static size_t convertUTF16EntityToUTF8(const UChar* utf16Entity, size_t numberOf
|
| static xmlEntityPtr getXHTMLEntity(const xmlChar* name)
|
| {
|
| UChar utf16DecodedEntity[4];
|
| - size_t numberOfCodeUnits = decodeNamedEntityToUCharArray(reinterpret_cast<const char*>(name), utf16DecodedEntity);
|
| + std::size_t numberOfCodeUnits = decodeNamedEntityToUCharArray(reinterpret_cast<const char*>(name), utf16DecodedEntity);
|
| if (!numberOfCodeUnits)
|
| return 0;
|
|
|
| ASSERT(numberOfCodeUnits <= 4);
|
| - size_t entityLengthInUTF8 = convertUTF16EntityToUTF8(utf16DecodedEntity, numberOfCodeUnits,
|
| + std::size_t entityLengthInUTF8 = convertUTF16EntityToUTF8(utf16DecodedEntity, numberOfCodeUnits,
|
| reinterpret_cast<char*>(sharedXHTMLEntityResult), WTF_ARRAY_LENGTH(sharedXHTMLEntityResult));
|
| if (!entityLengthInUTF8)
|
| return 0;
|
|
|