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

Issue 800113002: Use C++11 range-based for loop in Source/core/inspector (Closed)

Created:
6 years ago by zhaoze.zhou

Modified:
6 years ago

Reviewers:
pfeldman, rwlbuis

CC:
blink-reviews, caseq+blink_chromium.org, loislo+blink_chromium.org, eustas+blink_chromium.org, malch+blink_chromium.org, yurys+blink_chromium.org, lushnikov+blink_chromium.org, vsevik+blink_chromium.org, pfeldman+blink_chromium.org, paulirish+reviews_chromium.org, apavlov+blink_chromium.org, devtools-reviews_chromium.org, sergeyv+blink_chromium.org, aandrey+blink_chromium.org

Base URL:
https://chromium.googlesource.com/chromium/blink.git@master

Target Ref:
refs/heads/master

Project:
blink

Visibility:
Public.

More Reviews

Description

Use C++11 range-based for loop in Source/core/inspector BUG=None Committed: https://src.chromium.org/viewvc/blink?view=rev&revision=187546

Patch Set 1 #

Patch Set 2 : rebase #

Patch Set 3 : rebase again #

Patch Set 4 : REBASE AGAIN! #

Total comments: 10

Patch Set 5 : remove unnecessary copy #

Patch Set 6 : rebase #

Patch Set 7 : rebase again and again! #

Created: 6 years ago

Download [raw] [tar.bz2]

	Unified diffs	Side-by-side diffs	Delta from patch set	Stats (+158 lines, -196 lines)			Patch
M	Source/core/inspector/ContentSearchUtils.cpp	View	1 2 3 4 5	1 chunk	+2 lines, -2 lines	0 comments	Download
M	Source/core/inspector/DOMPatchSupport.cpp	View	1 2 3 4 5	4 chunks	+12 lines, -15 lines	0 comments	Download
M	Source/core/inspector/InjectedScriptManager.cpp	View	1 2 3 4 5	2 chunks	+5 lines, -5 lines	0 comments	Download
M	Source/core/inspector/InspectorCSSAgent.cpp	View	1 2 3 4 5	9 chunks	+18 lines, -21 lines	0 comments	Download
M	Source/core/inspector/InspectorCanvasAgent.cpp	View	1 2 3 4 5	4 chunks	+8 lines, -8 lines	0 comments	Download
M	Source/core/inspector/InspectorDOMAgent.cpp	View	1 2 3 4 5	10 chunks	+21 lines, -28 lines	0 comments	Download
M	Source/core/inspector/InspectorDOMDebuggerAgent.cpp	View	1 2 3 4 5	1 chunk	+3 lines, -3 lines	0 comments	Download
M	Source/core/inspector/InspectorDebuggerAgent.cpp	View	1 2 3 4 5	4 chunks	+9 lines, -9 lines	0 comments	Download
M	Source/core/inspector/InspectorInputAgent.cpp	View	1 2 3 4 5	1 chunk	+2 lines, -3 lines	0 comments	Download
M	Source/core/inspector/InspectorInstrumentation.cpp	View	1 2 3 4	1 chunk	+1 line, -3 lines	0 comments	Download
M	Source/core/inspector/InspectorPageAgent.cpp	View	1 2 3 4 5	7 chunks	+11 lines, -17 lines	0 comments	Download
M	Source/core/inspector/InspectorProfilerAgent.cpp	View	1 2 3 4 5	1 chunk	+2 lines, -3 lines	0 comments	Download
M	Source/core/inspector/InspectorResourceAgent.cpp	View	1 2 3 4 5 6	7 chunks	+19 lines, -25 lines	0 comments	Download
M	Source/core/inspector/InspectorResourceContentLoader.cpp	View	1 2 3 4 5	4 chunks	+6 lines, -8 lines	0 comments	Download
M	Source/core/inspector/InspectorState.cpp	View	1 2 3 4 5	1 chunk	+4 lines, -5 lines	0 comments	Download
M	Source/core/inspector/InspectorStyleSheet.cpp	View	1 2 3 4 5	4 chunks	+10 lines, -10 lines	0 comments	Download
M	Source/core/inspector/InspectorTimelineAgent.cpp	View	1 2 3 4 5	1 chunk	+2 lines, -2 lines	0 comments	Download
M	Source/core/inspector/InspectorWorkerAgent.cpp	View	1 2 3 4 5	2 chunks	+7 lines, -7 lines	0 comments	Download
M	Source/core/inspector/NetworkResourcesData.cpp	View	1 2 3 4 5	3 chunks	+11 lines, -17 lines	0 comments	Download
M	Source/core/inspector/PromiseTracker.cpp	View	1 2 3 4 5	1 chunk	+2 lines, -2 lines	0 comments	Download
M	Source/core/inspector/TraceEventDispatcher.cpp	View	1 2 3 4 5	2 chunks	+3 lines, -3 lines	0 comments	Download

Messages

Total messages: 18 (8 generated)

Expand Messages | Collapse Messages | Show Generated Messages | Hide Generated Messages

rwlbuis

On 2014/12/16 15:20:33, zhaoze.zhou wrote: lgtm. Much more readable.

6 years ago (2014-12-16 15:27:30 UTC) #3

pfeldman

https://codereview.chromium.org/800113002/diff/80001/Source/core/inspector/DOMPatchSupport.cpp File Source/core/inspector/DOMPatchSupport.cpp (right): https://codereview.chromium.org/800113002/diff/80001/Source/core/inspector/DOMPatchSupport.cpp#newcode203 Source/core/inspector/DOMPatchSupport.cpp:203: for (auto it : attributes) { Here and below: ...

6 years ago (2014-12-16 16:52:11 UTC) #7

zhaoze.zhou

6 years ago (2014-12-16 18:56:40 UTC) #9

commit-bot: I haz the power

CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/800113002/160001

6 years ago (2014-12-19 13:05:26 UTC) #13

commit-bot: I haz the power

Failed to apply patch for Source/core/inspector/InspectorResourceAgent.cpp: While running patch -p1 --forward --force --no-backup-if-mismatch; patching file ...

6 years ago (2014-12-19 13:05:41 UTC) #15

Failed to apply patch for Source/core/inspector/InspectorResourceAgent.cpp:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file Source/core/inspector/InspectorResourceAgent.cpp
  Hunk #2 succeeded at 422 (offset 14 lines).
  Hunk #3 succeeded at 586 (offset 14 lines).
  Hunk #4 succeeded at 628 (offset 14 lines).
  Hunk #5 FAILED at 837.
  Hunk #6 succeeded at 904 (offset 16 lines).
  Hunk #7 succeeded at 971 (offset 16 lines).
  1 out of 7 hunks FAILED -- saving rejects to file
Source/core/inspector/InspectorResourceAgent.cpp.rej

Patch:       Source/core/inspector/InspectorResourceAgent.cpp
Index: Source/core/inspector/InspectorResourceAgent.cpp
diff --git a/Source/core/inspector/InspectorResourceAgent.cpp
b/Source/core/inspector/InspectorResourceAgent.cpp
index
18fddcf6f00966b73a4a2fca9dd29a9ac12b302f..23bd94a33fa8aaa07b5e04889dc956bd732c771f
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& header : headers)
+        headersObject->setString(header.key.string(), header.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& header : *headers) {
             String value;
-            if (it->value->asString(&value))
-                request.setHTTPHeaderField(AtomicString(it->key),
AtomicString(value));
+            if (header.value->asString(&value))
+                request.setHTTPHeaderField(AtomicString(header.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& header : headers)
+        xhrReplayData->addHeader(header.key, header.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& request : requestIds)
+        m_resourcesData->setResourceContent(request, 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& header : xhrReplayData->headers())
+        xhr->setRequestHeader(header.key, header.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& header : *(*requestHeaders)) {
             String value;
-            bool success = it->value->asString(&value);
+            bool success = header.value->asString(&value);
             if (!success) {
-                *errorString = "Request header \"" + it->key + "\" value is not
a string";
+                *errorString = "Request header \"" + header.key + "\" value is
not a string";
                 return;
             }
-            request.addHTTPHeaderField(AtomicString(it->key),
AtomicString(value));
+            request.addHTTPHeaderField(AtomicString(header.key),
AtomicString(value));
         }
     }
     request.addHTTPHeaderField(kDevToolsRequestInitiator, "frontend");
@@ -959,11 +954,10 @@ bool
InspectorResourceAgent::fetchResourceContent(Document* document, const KURL
         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& resource : m_resourcesData->resources()) {
+        if (resource->url() == url) {
+            *content = resource->content();
+            *base64Encoded = resource->base64Encoded();
             return true;
         }
     }

commit-bot: I haz the power

CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/800113002/180001

6 years ago (2014-12-19 15:32:38 UTC) #17

commit-bot: I haz the power

6 years ago (2014-12-19 17:07:03 UTC) #18

Message was sent while issue was closed.

Committed patchset #7 (id:180001) as
https://src.chromium.org/viewvc/blink?view=rev&revision=187546

Expand Messages | Collapse Messages | Show Generated Messages | Hide Generated Messages