<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[182622] trunk/Source/WebKit2</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/182622">182622</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-04-09 23:07:56 -0700 (Thu, 09 Apr 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>Use modern loops in WebProcess
https://bugs.webkit.org/show_bug.cgi?id=143302

Patch by Hunseop Jeong &lt;hs85.jeong@samsung.com&gt; on 2015-04-09
Reviewed by Darin Adler.

Use modern range for-loops in WebProcess.

No new tests, no behavior change.

* WebProcess/WebProcess.cpp:
(WebKit::WebProcess::initializeConnection):
(WebKit::WebProcess::initializeWebProcess):
(WebKit::WebProcess::focusedWebPage):
(WebKit::WebProcess::webPageGroup):
(WebKit::WebProcess::setTextCheckerState):
(WebKit::WebProcess::resetAllGeolocationPermissions):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebProcesscpp">trunk/Source/WebKit2/WebProcess/WebProcess.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (182621 => 182622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog        2015-04-10 05:21:14 UTC (rev 182621)
+++ trunk/Source/WebKit2/ChangeLog        2015-04-10 06:07:56 UTC (rev 182622)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2015-04-09  Hunseop Jeong  &lt;hs85.jeong@samsung.com&gt;
+
+        Use modern loops in WebProcess 
+        https://bugs.webkit.org/show_bug.cgi?id=143302
+
+        Reviewed by Darin Adler.
+
+        Use modern range for-loops in WebProcess.
+
+        No new tests, no behavior change.
+
+        * WebProcess/WebProcess.cpp:
+        (WebKit::WebProcess::initializeConnection):
+        (WebKit::WebProcess::initializeWebProcess):
+        (WebKit::WebProcess::focusedWebPage):
+        (WebKit::WebProcess::webPageGroup):
+        (WebKit::WebProcess::setTextCheckerState):
+        (WebKit::WebProcess::resetAllGeolocationPermissions):
+
</ins><span class="cx"> 2015-04-09  Gordon Sheridan  &lt;gordon_sheridan@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Track IconDatabase retain counts for WebContent processes. Balance retain/releases for processes that terminate before successfully doing it themselves.
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebProcess.cpp (182621 => 182622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebProcess.cpp        2015-04-10 05:21:14 UTC (rev 182621)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.cpp        2015-04-10 06:07:56 UTC (rev 182622)
</span><span class="lines">@@ -235,12 +235,10 @@
</span><span class="cx"> #if ENABLE(SEC_ITEM_SHIM)
</span><span class="cx">     SecItemShim::singleton().initializeConnection(connection);
</span><span class="cx"> #endif
</span><del>-    
-    WebProcessSupplementMap::const_iterator it = m_supplements.begin();
-    WebProcessSupplementMap::const_iterator end = m_supplements.end();
-    for (; it != end; ++it)
-        it-&gt;value-&gt;initializeConnection(connection);
</del><span class="cx"> 
</span><ins>+    for (auto&amp; supplement : m_supplements.values())
+        supplement-&gt;initializeConnection(connection);
+
</ins><span class="cx">     m_webConnection = WebConnectionToUIProcess::create(this);
</span><span class="cx"> 
</span><span class="cx">     // In order to ensure that the asynchronous messages that are used for notifying the UI process
</span><span class="lines">@@ -291,10 +289,8 @@
</span><span class="cx">     if (!parameters.injectedBundlePath.isEmpty())
</span><span class="cx">         m_injectedBundle = InjectedBundle::create(parameters, transformHandlesToObjects(parameters.initializationUserData.object()).get());
</span><span class="cx"> 
</span><del>-    WebProcessSupplementMap::const_iterator it = m_supplements.begin();
-    WebProcessSupplementMap::const_iterator end = m_supplements.end();
-    for (; it != end; ++it)
-        it-&gt;value-&gt;initialize(parameters);
</del><ins>+    for (auto&amp; supplement : m_supplements.values())
+        supplement-&gt;initialize(parameters);
</ins><span class="cx"> 
</span><span class="cx"> #if ENABLE(ICONDATABASE)
</span><span class="cx">     m_iconDatabaseProxy-&gt;setEnabled(parameters.iconDatabaseEnabled);
</span><span class="lines">@@ -313,29 +309,29 @@
</span><span class="cx"> 
</span><span class="cx">     m_fullKeyboardAccessEnabled = parameters.fullKeyboardAccessEnabled;
</span><span class="cx"> 
</span><del>-    for (size_t i = 0; i &lt; parameters.urlSchemesRegistererdAsEmptyDocument.size(); ++i)
-        registerURLSchemeAsEmptyDocument(parameters.urlSchemesRegistererdAsEmptyDocument[i]);
</del><ins>+    for (auto&amp; scheme : parameters.urlSchemesRegistererdAsEmptyDocument)
+        registerURLSchemeAsEmptyDocument(scheme);
</ins><span class="cx"> 
</span><del>-    for (size_t i = 0; i &lt; parameters.urlSchemesRegisteredAsSecure.size(); ++i)
-        registerURLSchemeAsSecure(parameters.urlSchemesRegisteredAsSecure[i]);
</del><ins>+    for (auto&amp; scheme : parameters.urlSchemesRegisteredAsSecure)
+        registerURLSchemeAsSecure(scheme);
</ins><span class="cx"> 
</span><del>-    for (size_t i = 0; i &lt; parameters.urlSchemesRegisteredAsBypassingContentSecurityPolicy.size(); ++i)
-        registerURLSchemeAsBypassingContentSecurityPolicy(parameters.urlSchemesRegisteredAsBypassingContentSecurityPolicy[i]);
</del><ins>+    for (auto&amp; scheme : parameters.urlSchemesRegisteredAsBypassingContentSecurityPolicy)
+        registerURLSchemeAsBypassingContentSecurityPolicy(scheme);
</ins><span class="cx"> 
</span><del>-    for (size_t i = 0; i &lt; parameters.urlSchemesForWhichDomainRelaxationIsForbidden.size(); ++i)
-        setDomainRelaxationForbiddenForURLScheme(parameters.urlSchemesForWhichDomainRelaxationIsForbidden[i]);
</del><ins>+    for (auto&amp; scheme : parameters.urlSchemesForWhichDomainRelaxationIsForbidden)
+        setDomainRelaxationForbiddenForURLScheme(scheme);
</ins><span class="cx"> 
</span><del>-    for (size_t i = 0; i &lt; parameters.urlSchemesRegisteredAsLocal.size(); ++i)
-        registerURLSchemeAsLocal(parameters.urlSchemesRegisteredAsLocal[i]);
</del><ins>+    for (auto&amp; scheme : parameters.urlSchemesRegisteredAsLocal)
+        registerURLSchemeAsLocal(scheme);
</ins><span class="cx"> 
</span><del>-    for (size_t i = 0; i &lt; parameters.urlSchemesRegisteredAsNoAccess.size(); ++i)
-        registerURLSchemeAsNoAccess(parameters.urlSchemesRegisteredAsNoAccess[i]);
</del><ins>+    for (auto&amp; scheme : parameters.urlSchemesRegisteredAsNoAccess)
+        registerURLSchemeAsNoAccess(scheme);
</ins><span class="cx"> 
</span><del>-    for (size_t i = 0; i &lt; parameters.urlSchemesRegisteredAsDisplayIsolated.size(); ++i)
-        registerURLSchemeAsDisplayIsolated(parameters.urlSchemesRegisteredAsDisplayIsolated[i]);
</del><ins>+    for (auto&amp; scheme : parameters.urlSchemesRegisteredAsDisplayIsolated)
+        registerURLSchemeAsDisplayIsolated(scheme);
</ins><span class="cx"> 
</span><del>-    for (size_t i = 0; i &lt; parameters.urlSchemesRegisteredAsCORSEnabled.size(); ++i)
-        registerURLSchemeAsCORSEnabled(parameters.urlSchemesRegisteredAsCORSEnabled[i]);
</del><ins>+    for (auto&amp; scheme : parameters.urlSchemesRegisteredAsCORSEnabled)
+        registerURLSchemeAsCORSEnabled(scheme);
</ins><span class="cx"> 
</span><span class="cx"> #if ENABLE(CACHE_PARTITIONING)
</span><span class="cx">     for (auto&amp; scheme : parameters.urlSchemesRegisteredAsCachePartitioned)
</span><span class="lines">@@ -368,8 +364,8 @@
</span><span class="cx">     setTerminationTimeout(parameters.terminationTimeout);
</span><span class="cx"> 
</span><span class="cx">     resetPlugInAutoStartOriginHashes(parameters.plugInAutoStartOriginHashes);
</span><del>-    for (size_t i = 0; i &lt; parameters.plugInAutoStartOrigins.size(); ++i)
-        m_plugInAutoStartOrigins.add(parameters.plugInAutoStartOrigins[i]);
</del><ins>+    for (auto&amp; origin : parameters.plugInAutoStartOrigins)
+        m_plugInAutoStartOrigins.add(origin);
</ins><span class="cx"> 
</span><span class="cx">     setMemoryCacheDisabled(parameters.memoryCacheDisabled);
</span><span class="cx"> 
</span><span class="lines">@@ -538,11 +534,9 @@
</span><span class="cx"> 
</span><span class="cx"> WebPage* WebProcess::focusedWebPage() const
</span><span class="cx"> {    
</span><del>-    HashMap&lt;uint64_t, RefPtr&lt;WebPage&gt;&gt;::const_iterator end = m_pageMap.end();
-    for (HashMap&lt;uint64_t, RefPtr&lt;WebPage&gt;&gt;::const_iterator it = m_pageMap.begin(); it != end; ++it) {
-        WebPage* page = (*it).value.get();
</del><ins>+    for (auto&amp; page : m_pageMap.values()) {
</ins><span class="cx">         if (page-&gt;windowAndWebPageAreFocused())
</span><del>-            return page;
</del><ins>+            return page.get();
</ins><span class="cx">     }
</span><span class="cx">     return 0;
</span><span class="cx"> }
</span><span class="lines">@@ -695,9 +689,9 @@
</span><span class="cx"> 
</span><span class="cx"> WebPageGroupProxy* WebProcess::webPageGroup(PageGroup* pageGroup)
</span><span class="cx"> {
</span><del>-    for (HashMap&lt;uint64_t, RefPtr&lt;WebPageGroupProxy&gt;&gt;::const_iterator it = m_pageGroupMap.begin(), end = m_pageGroupMap.end(); it != end; ++it) {
-        if (it-&gt;value-&gt;corePageGroup() == pageGroup)
-            return it-&gt;value.get();
</del><ins>+    for (auto&amp; page : m_pageGroupMap.values()) {
+        if (page-&gt;corePageGroup() == pageGroup)
+            return page.get();
</ins><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     return 0;
</span><span class="lines">@@ -1143,9 +1137,7 @@
</span><span class="cx">     if (!continuousSpellCheckingTurnedOff &amp;&amp; !grammarCheckingTurnedOff)
</span><span class="cx">         return;
</span><span class="cx"> 
</span><del>-    HashMap&lt;uint64_t, RefPtr&lt;WebPage&gt;&gt;::iterator end = m_pageMap.end();
-    for (HashMap&lt;uint64_t, RefPtr&lt;WebPage&gt;&gt;::iterator it = m_pageMap.begin(); it != end; ++it) {
-        WebPage* page = (*it).value.get();
</del><ins>+    for (auto&amp; page : m_pageMap.values()) {
</ins><span class="cx">         if (continuousSpellCheckingTurnedOff)
</span><span class="cx">             page-&gt;unmarkAllMisspellings();
</span><span class="cx">         if (grammarCheckingTurnedOff)
</span><span class="lines">@@ -1219,8 +1211,7 @@
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> void WebProcess::resetAllGeolocationPermissions()
</span><span class="cx"> {
</span><del>-    for (auto it = m_pageMap.begin(), end = m_pageMap.end(); it != end; ++it) {
-        WebPage* page = (*it).value.get();
</del><ins>+    for (auto&amp; page : m_pageMap.values()) {
</ins><span class="cx">         if (Frame* mainFrame = page-&gt;mainFrame())
</span><span class="cx">             mainFrame-&gt;resetAllGeolocationPermission();
</span><span class="cx">     }
</span></span></pre>
</div>
</div>

</body>
</html>