X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fthird_party%2FWebKit%2FSource%2Fcore%2Fhtml%2Fparser%2FHTMLPreloadScanner.cpp;h=7f3d7dc6a21c1fd714a213bee3d0472e2e1f6136;hb=1afa4dd80ef85af7c90efaea6959db1d92330844;hp=351484f93700fd21f533d62844d974acb262a155;hpb=90762837333c13ccf56f2ad88e4481fc71e8d281;p=platform%2Fframework%2Fweb%2Fcrosswalk.git diff --git a/src/third_party/WebKit/Source/core/html/parser/HTMLPreloadScanner.cpp b/src/third_party/WebKit/Source/core/html/parser/HTMLPreloadScanner.cpp index 351484f..7f3d7dc 100644 --- a/src/third_party/WebKit/Source/core/html/parser/HTMLPreloadScanner.cpp +++ b/src/third_party/WebKit/Source/core/html/parser/HTMLPreloadScanner.cpp @@ -68,7 +68,7 @@ static const StringImpl* tagImplFor(const HTMLToken::DataVector& data) const StringImpl* result = tagName.impl(); if (result->isStatic()) return result; - return 0; + return nullptr; } static const StringImpl* tagImplFor(const String& tagName) @@ -76,7 +76,7 @@ static const StringImpl* tagImplFor(const String& tagName) const StringImpl* result = tagName.impl(); if (result->isStatic()) return result; - return 0; + return nullptr; } static String initiatorFor(const StringImpl* tagImpl) @@ -137,9 +137,9 @@ public: ASSERT(isMainThread()); if (!m_tagImpl) return; - for (HTMLToken::AttributeList::const_iterator iter = attributes.begin(); iter != attributes.end(); ++iter) { - AtomicString attributeName(iter->name); - String attributeValue = StringImpl::create8BitIfPossible(iter->value); + for (const HTMLToken::Attribute& htmlTokenAttribute : attributes) { + AtomicString attributeName(htmlTokenAttribute.name); + String attributeValue = StringImpl::create8BitIfPossible(htmlTokenAttribute.value); processAttribute(attributeName, attributeValue); } } @@ -148,8 +148,8 @@ public: { if (!m_tagImpl) return; - for (Vector::const_iterator iter = attributes.begin(); iter != attributes.end(); ++iter) - processAttribute(iter->name, iter->value); + for (const CompactHTMLToken::Attribute& htmlTokenAttribute : attributes) + processAttribute(htmlTokenAttribute.name, htmlTokenAttribute.value); } void handlePictureSourceURL(String& sourceURL)