Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(870)

Unified Diff: Source/core/fetch/RawResource.cpp

Issue 645513003: Use C++11 range-based loop in core/fetch (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: mike's comments Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/core/fetch/RawResource.cpp
diff --git a/Source/core/fetch/RawResource.cpp b/Source/core/fetch/RawResource.cpp
index 3977f56350ff0d59fc2f56da6371801685e010d2..38699e8c7313d23e364d0a8e82f94d29051e52b0 100644
--- a/Source/core/fetch/RawResource.cpp
+++ b/Source/core/fetch/RawResource.cpp
@@ -57,15 +57,12 @@ void RawResource::didAddClient(ResourceClient* c)
// so a protector is necessary.
ResourcePtr<RawResource> protect(this);
RawResourceClient* client = static_cast<RawResourceClient*>(c);
- size_t redirectCount = redirectChain().size();
- for (size_t i = 0; i < redirectCount; i++) {
- RedirectPair redirect = redirectChain()[i];
+ for (const auto& redirect : redirectChain()) {
ResourceRequest request(redirect.m_request);
client->redirectReceived(this, request, redirect.m_redirectResponse);
if (!hasClient(c))
return;
}
- ASSERT(redirectCount == redirectChain().size());
if (!m_response.isNull())
client->responseReceived(this, m_response);
@@ -173,17 +170,15 @@ bool RawResource::canReuse(const ResourceRequest& newRequest) const
const HTTPHeaderMap& newHeaders = newRequest.httpHeaderFields();
const HTTPHeaderMap& oldHeaders = m_resourceRequest.httpHeaderFields();
- HTTPHeaderMap::const_iterator end = newHeaders.end();
- for (HTTPHeaderMap::const_iterator i = newHeaders.begin(); i != end; ++i) {
- AtomicString headerName = i->key;
- if (!shouldIgnoreHeaderForCacheReuse(headerName) && i->value != oldHeaders.get(headerName))
+ for (const auto& header : newHeaders) {
+ AtomicString headerName = header.key;
+ if (!shouldIgnoreHeaderForCacheReuse(headerName) && header.value != oldHeaders.get(headerName))
return false;
}
- end = oldHeaders.end();
- for (HTTPHeaderMap::const_iterator i = oldHeaders.begin(); i != end; ++i) {
- AtomicString headerName = i->key;
- if (!shouldIgnoreHeaderForCacheReuse(headerName) && i->value != newHeaders.get(headerName))
+ for (const auto& header : oldHeaders) {
+ AtomicString headerName = header.key;
+ if (!shouldIgnoreHeaderForCacheReuse(headerName) && header.value != newHeaders.get(headerName))
return false;
}

Powered by Google App Engine
This is Rietveld 408576698