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

Unified Diff: Source/core/inspector/InspectorResourceAgent.cpp

Issue 800113002: Use C++11 range-based for loop in Source/core/inspector (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: REBASE AGAIN! Created 6 years 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/inspector/InspectorResourceAgent.cpp
diff --git a/Source/core/inspector/InspectorResourceAgent.cpp b/Source/core/inspector/InspectorResourceAgent.cpp
index 18fddcf6f00966b73a4a2fca9dd29a9ac12b302f..54033a49659d3f341e209764a3e45f6902799ccb 100644
--- a/Source/core/inspector/InspectorResourceAgent.cpp
+++ b/Source/core/inspector/InspectorResourceAgent.cpp
@@ -94,9 +94,8 @@ const char kDevToolsEmulateNetworkConditionsClientId[] = "X-DevTools-Emulate-Net
static PassRefPtr<JSONObject> buildObjectForHeaders(const HTTPHeaderMap& headers)
{
RefPtr<JSONObject> headersObject = JSONObject::create();
- HTTPHeaderMap::const_iterator end = headers.end();
- for (HTTPHeaderMap::const_iterator it = headers.begin(); it != end; ++it)
- headersObject->setString(it->key.string(), it->value);
+ for (const auto& it : headers)
+ headersObject->setString(it.key.string(), it.value);
return headersObject;
}
@@ -409,11 +408,10 @@ void InspectorResourceAgent::willSendRequest(unsigned long identifier, DocumentL
RefPtr<JSONObject> headers = m_state->getObject(ResourceAgentState::extraRequestHeaders);
if (headers) {
- JSONObject::const_iterator end = headers->end();
- for (JSONObject::const_iterator it = headers->begin(); it != end; ++it) {
+ for (const auto& it : *headers) {
String value;
- if (it->value->asString(&value))
- request.setHTTPHeaderField(AtomicString(it->key), AtomicString(value));
+ if (it.value->asString(&value))
+ request.setHTTPHeaderField(AtomicString(it.key), AtomicString(value));
}
}
@@ -574,9 +572,8 @@ void InspectorResourceAgent::willLoadXHR(XMLHttpRequest* xhr, ThreadableLoaderCl
{
ASSERT(xhr);
RefPtrWillBeRawPtr<XHRReplayData> xhrReplayData = XHRReplayData::create(xhr->executionContext(), method, urlWithoutFragment(url), async, formData.get(), includeCredentials);
- HTTPHeaderMap::const_iterator end = headers.end();
- for (HTTPHeaderMap::const_iterator it = headers.begin(); it!= end; ++it)
- xhrReplayData->addHeader(it->key, it->value);
+ for (const auto& it : headers)
+ xhrReplayData->addHeader(it.key, it.value);
m_pendingXHRReplayData.set(client, xhrReplayData);
}
@@ -617,9 +614,8 @@ void InspectorResourceAgent::willDestroyResource(Resource* cachedResource)
bool base64Encoded;
if (!InspectorPageAgent::cachedResourceContent(cachedResource, &content, &base64Encoded))
return;
- Vector<String>::iterator end = requestIds.end();
- for (Vector<String>::iterator it = requestIds.begin(); it != end; ++it)
- m_resourcesData->setResourceContent(*it, content, base64Encoded);
+ for (auto it : requestIds)
+ m_resourcesData->setResourceContent(it, content, base64Encoded);
}
void InspectorResourceAgent::applyUserAgentOverride(String* userAgent)
@@ -841,9 +837,8 @@ void InspectorResourceAgent::replayXHR(ErrorString*, const String& requestId)
memoryCache()->removeURLFromCache(executionContext, xhrReplayData->url());
xhr->open(xhrReplayData->method(), xhrReplayData->url(), xhrReplayData->async(), IGNORE_EXCEPTION);
- HTTPHeaderMap::const_iterator end = xhrReplayData->headers().end();
- for (HTTPHeaderMap::const_iterator it = xhrReplayData->headers().begin(); it!= end; ++it)
- xhr->setRequestHeader(it->key, it->value, IGNORE_EXCEPTION);
+ for (const auto& it : xhrReplayData->headers())
+ xhr->setRequestHeader(it.key, it.value, IGNORE_EXCEPTION);
xhr->sendForInspectorXHRReplay(xhrReplayData->formData(), IGNORE_EXCEPTION);
m_replayXHRs.add(xhr);
@@ -892,14 +887,14 @@ void InspectorResourceAgent::loadResourceForFrontend(ErrorString* errorString, c
request.setRequestContext(blink::WebURLRequest::RequestContextInternal);
request.setCachePolicy(ReloadIgnoringCacheData);
if (requestHeaders) {
- for (JSONObject::iterator it = (*requestHeaders)->begin(); it != (*requestHeaders)->end(); ++it) {
+ for (auto it : *(*requestHeaders)) {
String value;
- bool success = it->value->asString(&value);
+ bool success = it.value->asString(&value);
if (!success) {
- *errorString = "Request header \"" + it->key + "\" value is not a string";
+ *errorString = "Request header \"" + it.key + "\" value is not a string";
return;
}
- request.addHTTPHeaderField(AtomicString(it->key), AtomicString(value));
+ request.addHTTPHeaderField(AtomicString(it.key), AtomicString(value));
}
}
request.addHTTPHeaderField(kDevToolsRequestInitiator, "frontend");
@@ -960,10 +955,10 @@ bool InspectorResourceAgent::fetchResourceContent(Document* document, const KURL
// Then fall back to resource data.
Vector<NetworkResourcesData::ResourceData*> resources = m_resourcesData->resources();
- for (Vector<NetworkResourcesData::ResourceData*>::iterator it = resources.begin(); it != resources.end(); ++it) {
- if ((*it)->url() == url) {
- *content = (*it)->content();
- *base64Encoded = (*it)->base64Encoded();
+ for (auto it : resources) {
pfeldman 2014/12/16 16:52:10 while you are here, auto it : m_resourcesData->res
zhaoze.zhou 2014/12/16 18:56:40 Done.
+ if (it->url() == url) {
+ *content = it->content();
+ *base64Encoded = it->base64Encoded();
return true;
}
}

Powered by Google App Engine
This is Rietveld 408576698