Use C++11 range-based for loop in Source/core/inspector

Source/core/inspector/InspectorResourceAgent.cpp

 /*
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 76 matching lines @@
 
 namespace {
 
 // Keep in sync with kDevToolsRequestInitiator defined in devtools_network_controller.cc
 const char kDevToolsRequestInitiator[] = "X-DevTools-Request-Initiator";
 const char kDevToolsEmulateNetworkConditionsClientId[] = "X-DevTools-Emulate-Network-Conditions-Client-Id";
 
 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;
 }
 
 class InspectorFileReaderLoaderClient final : public FileReaderLoaderClient {
     WTF_MAKE_NONCOPYABLE(InspectorFileReaderLoaderClient);
 public:
     InspectorFileReaderLoaderClient(PassRefPtr<BlobDataHandle> blob, PassOwnPtr<TextResourceDecoder> decoder, PassRefPtrWillBeRawPtr<GetResponseBodyCallback> callback)
         : m_blob(blob)
         , m_decoder(decoder)
         , m_callback(callback)
@@ skipping 292 matching lines @@
         type = InspectorPageAgent::XHRResource;
         m_resourcesData->setResourceType(requestId, type);
     } else if (initiatorInfo.name == FetchInitiatorTypeNames::document) {
         type = InspectorPageAgent::DocumentResource;
         m_resourcesData->setResourceType(requestId, type);
     }
 
     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));
         }
     }
 
     request.setReportRawHeaders(true);
 
     if (m_state->getBoolean(ResourceAgentState::cacheDisabled)) {
         request.setCachePolicy(ReloadBypassingCache);
         request.setShouldResetAppCache(true);
     }
 
@@ skipping 140 matching lines @@
     m_resourcesData->setResourceType(IdentifiersFactory::requestId(identifier), InspectorPageAgent::XHRResource);
     XHRReplayData* xhrReplayData = it->value.get();
     String requestId = IdentifiersFactory::requestId(identifier);
     m_resourcesData->setXHRReplayData(requestId, xhrReplayData);
 }
 
 void InspectorResourceAgent::willLoadXHR(XMLHttpRequest* xhr, ThreadableLoaderClient* client, const AtomicString& method, const KURL& url, bool async, PassRefPtr<FormData> formData, const HTTPHeaderMap& headers, bool includeCredentials)
 {
     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);
 }
 
 void InspectorResourceAgent::delayedRemoveReplayXHR(XMLHttpRequest* xhr)
 {
     if (!m_replayXHRs.contains(xhr))
         return;
 
     m_replayXHRsToBeDeleted.add(xhr);
     m_replayXHRs.remove(xhr);
@@ skipping 20 matching lines @@
 void InspectorResourceAgent::willDestroyResource(Resource* cachedResource)
 {
     Vector<String> requestIds = m_resourcesData->removeResource(cachedResource);
     if (!requestIds.size())
         return;
 
     String content;
     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)
 {
     String userAgentOverride = m_state->getString(ResourceAgentState::userAgentOverride);
     if (!userAgentOverride.isEmpty())
         *userAgent = userAgentOverride;
 }
 
 void InspectorResourceAgent::willRecalculateStyle(Document*)
@@ skipping 201 matching lines @@
     if (!executionContext) {
         m_resourcesData->setXHRReplayData(requestId, 0);
         return;
     }
 
     RefPtrWillBeRawPtr<XMLHttpRequest> xhr = XMLHttpRequest::create(executionContext);
 
     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);
 }
 
 void InspectorResourceAgent::canClearBrowserCache(ErrorString*, bool* result)
 {
     *result = true;
 }
 
@@ skipping 28 matching lines @@
     if (!document) {
         *errorString = "No Document instance for the specified frame";
         return;
     }
 
     ResourceRequest request(url);
     request.setHTTPMethod("GET");
     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");
 
     ThreadableLoaderOptions options;
     options.crossOriginRequestPolicy = AllowCrossOriginRequests;
 
     ResourceLoaderOptions resourceLoaderOptions;
     resourceLoaderOptions.allowCredentials = AllowStoredCredentials;
 
@@ skipping 40 matching lines @@
 {
     // First try to fetch content from the cached resource.
     Resource* cachedResource = document->fetcher()->cachedResource(url);
     if (!cachedResource)
         cachedResource = memoryCache()->resourceForURL(url, document->fetcher()->getCacheIdentifier());
     if (cachedResource && InspectorPageAgent::cachedResourceContent(cachedResource, content, base64Encoded))
         return true;
 
     // 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->resources() (seems like we don't
need a copy)

[zhaoze.zhou, 2014/12/16 18:56:40]

Done.

+        if (it->url() == url) {
+            *content = it->content();
+            *base64Encoded = it->base64Encoded();
             return true;
         }
     }
     return false;
 }
 
 void InspectorResourceAgent::removeFinishedReplayXHRFired(Timer<InspectorResourceAgent>*)
 {
     m_replayXHRsToBeDeleted.clear();
 }
 
 InspectorResourceAgent::InspectorResourceAgent(InspectorPageAgent* pageAgent)
     : InspectorBaseAgent<InspectorResourceAgent>("Network")
     , m_pageAgent(pageAgent)
     , m_frontend(0)
     , m_resourcesData(adoptPtr(new NetworkResourcesData()))
     , m_isRecalculatingStyle(false)
     , m_removeFinishedReplayXHRTimer(this, &InspectorResourceAgent::removeFinishedReplayXHRFired)
 {
 }
 
 bool InspectorResourceAgent::shouldForceCORSPreflight()
 {
     return m_state->getBoolean(ResourceAgentState::cacheDisabled);
 }
 
 } // namespace blink