<!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>[161634] trunk/Source/WebCore</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/161634">161634</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-01-10 08:19:06 -0800 (Fri, 10 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Convert some for loops over to range-based for
https://bugs.webkit.org/show_bug.cgi?id=126752
Reviewed by Antti Koivisto.
* inspector/InspectorApplicationCacheAgent.cpp:
(WebCore::InspectorApplicationCacheAgent::buildArrayForApplicationCacheResources):
* loader/appcache/ApplicationCache.cpp:
(WebCore::ApplicationCache::clearStorageID):
* loader/appcache/ApplicationCacheGroup.cpp:
(WebCore::ApplicationCacheGroup::didFinishLoadingManifest):
(WebCore::ApplicationCacheGroup::clearStorageID):
* loader/appcache/ApplicationCacheHost.cpp:
(WebCore::ApplicationCacheHost::fillResourceList):
* loader/appcache/ApplicationCacheResource.cpp:
(WebCore::ApplicationCacheResource::estimatedSizeInStorage):
* loader/appcache/ApplicationCacheStorage.cpp:
(WebCore::ApplicationCacheStorage::cacheGroupForURL):
* loader/archive/ArchiveFactory.cpp:
(WebCore::ArchiveFactory::registerKnownArchiveMIMETypes):
* page/animation/AnimationController.cpp:
(WebCore::AnimationControllerPrivate::styleAvailable):
(WebCore::AnimationControllerPrivate::startTimeResponse):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorApplicationCacheAgentcpp">trunk/Source/WebCore/inspector/InspectorApplicationCacheAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderappcacheApplicationCachecpp">trunk/Source/WebCore/loader/appcache/ApplicationCache.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderappcacheApplicationCacheGroupcpp">trunk/Source/WebCore/loader/appcache/ApplicationCacheGroup.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderappcacheApplicationCacheHostcpp">trunk/Source/WebCore/loader/appcache/ApplicationCacheHost.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderappcacheApplicationCacheResourcecpp">trunk/Source/WebCore/loader/appcache/ApplicationCacheResource.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderappcacheApplicationCacheStoragecpp">trunk/Source/WebCore/loader/appcache/ApplicationCacheStorage.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderarchiveArchiveFactorycpp">trunk/Source/WebCore/loader/archive/ArchiveFactory.cpp</a></li>
<li><a href="#trunkSourceWebCorepageanimationAnimationControllercpp">trunk/Source/WebCore/page/animation/AnimationController.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (161633 => 161634)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-10 15:40:52 UTC (rev 161633)
+++ trunk/Source/WebCore/ChangeLog 2014-01-10 16:19:06 UTC (rev 161634)
</span><span class="lines">@@ -1,5 +1,31 @@
</span><span class="cx"> 2014-01-10 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><ins>+ Convert some for loops over to range-based for
+ https://bugs.webkit.org/show_bug.cgi?id=126752
+
+ Reviewed by Antti Koivisto.
+
+ * inspector/InspectorApplicationCacheAgent.cpp:
+ (WebCore::InspectorApplicationCacheAgent::buildArrayForApplicationCacheResources):
+ * loader/appcache/ApplicationCache.cpp:
+ (WebCore::ApplicationCache::clearStorageID):
+ * loader/appcache/ApplicationCacheGroup.cpp:
+ (WebCore::ApplicationCacheGroup::didFinishLoadingManifest):
+ (WebCore::ApplicationCacheGroup::clearStorageID):
+ * loader/appcache/ApplicationCacheHost.cpp:
+ (WebCore::ApplicationCacheHost::fillResourceList):
+ * loader/appcache/ApplicationCacheResource.cpp:
+ (WebCore::ApplicationCacheResource::estimatedSizeInStorage):
+ * loader/appcache/ApplicationCacheStorage.cpp:
+ (WebCore::ApplicationCacheStorage::cacheGroupForURL):
+ * loader/archive/ArchiveFactory.cpp:
+ (WebCore::ArchiveFactory::registerKnownArchiveMIMETypes):
+ * page/animation/AnimationController.cpp:
+ (WebCore::AnimationControllerPrivate::styleAvailable):
+ (WebCore::AnimationControllerPrivate::startTimeResponse):
+
+2014-01-10 Anders Carlsson <andersca@apple.com>
+
</ins><span class="cx"> Tighten up two functions in the inspector code
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=126751
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorApplicationCacheAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorApplicationCacheAgent.cpp (161633 => 161634)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorApplicationCacheAgent.cpp 2014-01-10 15:40:52 UTC (rev 161633)
+++ trunk/Source/WebCore/inspector/InspectorApplicationCacheAgent.cpp 2014-01-10 16:19:06 UTC (rev 161634)
</span><span class="lines">@@ -166,10 +166,8 @@
</span><span class="cx"> {
</span><span class="cx"> RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::ApplicationCache::ApplicationCacheResource>> resources = Inspector::TypeBuilder::Array<Inspector::TypeBuilder::ApplicationCache::ApplicationCacheResource>::create();
</span><span class="cx">
</span><del>- ApplicationCacheHost::ResourceInfoList::const_iterator end = applicationCacheResources.end();
- ApplicationCacheHost::ResourceInfoList::const_iterator it = applicationCacheResources.begin();
- for (int i = 0; it != end; ++it, i++)
- resources->addItem(buildObjectForApplicationCacheResource(*it));
</del><ins>+ for (const auto& resourceInfo : applicationCacheResources)
+ resources->addItem(buildObjectForApplicationCacheResource(resourceInfo));
</ins><span class="cx">
</span><span class="cx"> return resources;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderappcacheApplicationCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/appcache/ApplicationCache.cpp (161633 => 161634)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/appcache/ApplicationCache.cpp 2014-01-10 15:40:52 UTC (rev 161633)
+++ trunk/Source/WebCore/loader/appcache/ApplicationCache.cpp 2014-01-10 16:19:06 UTC (rev 161634)
</span><span class="lines">@@ -186,9 +186,8 @@
</span><span class="cx"> {
</span><span class="cx"> m_storageID = 0;
</span><span class="cx">
</span><del>- ResourceMap::const_iterator end = m_resources.end();
- for (ResourceMap::const_iterator it = m_resources.begin(); it != end; ++it)
- it->value->clearStorageID();
</del><ins>+ for (const auto& resource : m_resources.values())
+ resource->clearStorageID();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ApplicationCache::deleteCacheForOrigin(SecurityOrigin* origin)
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderappcacheApplicationCacheGroupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/appcache/ApplicationCacheGroup.cpp (161633 => 161634)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/appcache/ApplicationCacheGroup.cpp 2014-01-10 15:40:52 UTC (rev 161633)
+++ trunk/Source/WebCore/loader/appcache/ApplicationCacheGroup.cpp 2014-01-10 16:19:06 UTC (rev 161634)
</span><span class="lines">@@ -781,17 +781,15 @@
</span><span class="cx"> ASSERT(m_pendingEntries.isEmpty());
</span><span class="cx">
</span><span class="cx"> if (isUpgradeAttempt) {
</span><del>- ApplicationCache::ResourceMap::const_iterator end = m_newestCache->end();
- for (ApplicationCache::ResourceMap::const_iterator it = m_newestCache->begin(); it != end; ++it) {
- unsigned type = it->value->type();
</del><ins>+ for (const auto& urlAndResource : *m_newestCache) {
+ unsigned type = urlAndResource.value->type();
</ins><span class="cx"> if (type & ApplicationCacheResource::Master)
</span><del>- addEntry(it->key, type);
</del><ins>+ addEntry(urlAndResource.key, type);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- HashSet<String>::const_iterator end = manifest.explicitURLs.end();
- for (HashSet<String>::const_iterator it = manifest.explicitURLs.begin(); it != end; ++it)
- addEntry(*it, ApplicationCacheResource::Explicit);
</del><ins>+ for (const auto& explicitURL : manifest.explicitURLs)
+ addEntry(explicitURL, ApplicationCacheResource::Explicit);
</ins><span class="cx">
</span><span class="cx"> size_t fallbackCount = manifest.fallbackURLs.size();
</span><span class="cx"> for (size_t i = 0; i < fallbackCount; ++i)
</span><span class="lines">@@ -1179,9 +1177,8 @@
</span><span class="cx"> {
</span><span class="cx"> m_storageID = 0;
</span><span class="cx">
</span><del>- HashSet<ApplicationCache*>::const_iterator end = m_caches.end();
- for (HashSet<ApplicationCache*>::const_iterator it = m_caches.begin(); it != end; ++it)
- (*it)->clearStorageID();
</del><ins>+ for (const auto& cache : m_caches)
+ cache->clearStorageID();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderappcacheApplicationCacheHostcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/appcache/ApplicationCacheHost.cpp (161633 => 161634)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/appcache/ApplicationCacheHost.cpp 2014-01-10 15:40:52 UTC (rev 161633)
+++ trunk/Source/WebCore/loader/appcache/ApplicationCacheHost.cpp 2014-01-10 16:19:06 UTC (rev 161634)
</span><span class="lines">@@ -285,10 +285,9 @@
</span><span class="cx"> ApplicationCache* cache = applicationCache();
</span><span class="cx"> if (!cache || !cache->isComplete())
</span><span class="cx"> return;
</span><del>-
- ApplicationCache::ResourceMap::const_iterator end = cache->end();
- for (ApplicationCache::ResourceMap::const_iterator it = cache->begin(); it != end; ++it) {
- RefPtr<ApplicationCacheResource> resource = it->value;
</del><ins>+
+ for (const auto& urlAndResource : *cache) {
+ RefPtr<ApplicationCacheResource> resource = urlAndResource.value;
</ins><span class="cx"> unsigned type = resource->type();
</span><span class="cx"> bool isMaster = type & ApplicationCacheResource::Master;
</span><span class="cx"> bool isManifest = type & ApplicationCacheResource::Manifest;
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderappcacheApplicationCacheResourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/appcache/ApplicationCacheResource.cpp (161633 => 161634)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/appcache/ApplicationCacheResource.cpp 2014-01-10 15:40:52 UTC (rev 161633)
+++ trunk/Source/WebCore/loader/appcache/ApplicationCacheResource.cpp 2014-01-10 16:19:06 UTC (rev 161634)
</span><span class="lines">@@ -52,9 +52,8 @@
</span><span class="cx"> if (data())
</span><span class="cx"> m_estimatedSizeInStorage = data()->size();
</span><span class="cx">
</span><del>- HTTPHeaderMap::const_iterator end = response().httpHeaderFields().end();
- for (HTTPHeaderMap::const_iterator it = response().httpHeaderFields().begin(); it != end; ++it)
- m_estimatedSizeInStorage += (it->key.length() + it->value.length() + 2) * sizeof(UChar);
</del><ins>+ for (const auto& headerField : response().httpHeaderFields())
+ m_estimatedSizeInStorage += (headerField.key.length() + headerField.value.length() + 2) * sizeof(UChar);
</ins><span class="cx">
</span><span class="cx"> m_estimatedSizeInStorage += url().string().length() * sizeof(UChar);
</span><span class="cx"> m_estimatedSizeInStorage += sizeof(int); // response().m_httpStatusCode
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderappcacheApplicationCacheStoragecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/appcache/ApplicationCacheStorage.cpp (161633 => 161634)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/appcache/ApplicationCacheStorage.cpp 2014-01-10 15:40:52 UTC (rev 161633)
+++ trunk/Source/WebCore/loader/appcache/ApplicationCacheStorage.cpp 2014-01-10 16:19:06 UTC (rev 161634)
</span><span class="lines">@@ -210,10 +210,7 @@
</span><span class="cx"> return 0;
</span><span class="cx">
</span><span class="cx"> // Check if a cache already exists in memory.
</span><del>- CacheGroupMap::const_iterator end = m_cachesInMemory.end();
- for (CacheGroupMap::const_iterator it = m_cachesInMemory.begin(); it != end; ++it) {
- ApplicationCacheGroup* group = it->value;
-
</del><ins>+ for (const auto& group : m_cachesInMemory.values()) {
</ins><span class="cx"> ASSERT(!group->isObsolete());
</span><span class="cx">
</span><span class="cx"> if (!protocolHostAndPortAreEqual(url, group->manifestURL()))
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderarchiveArchiveFactorycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/archive/ArchiveFactory.cpp (161633 => 161634)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/archive/ArchiveFactory.cpp 2014-01-10 15:40:52 UTC (rev 161633)
+++ trunk/Source/WebCore/loader/archive/ArchiveFactory.cpp 2014-01-10 16:19:06 UTC (rev 161634)
</span><span class="lines">@@ -91,11 +91,9 @@
</span><span class="cx"> void ArchiveFactory::registerKnownArchiveMIMETypes()
</span><span class="cx"> {
</span><span class="cx"> HashSet<String>& mimeTypes = MIMETypeRegistry::getSupportedNonImageMIMETypes();
</span><del>- ArchiveMIMETypesMap::iterator i = archiveMIMETypes().begin();
- ArchiveMIMETypesMap::iterator end = archiveMIMETypes().end();
-
- for (; i != end; ++i)
- mimeTypes.add(i->key);
</del><ins>+
+ for (const auto& mimeType : archiveMIMETypes().keys())
+ mimeTypes.add(mimeType);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorepageanimationAnimationControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/animation/AnimationController.cpp (161633 => 161634)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/animation/AnimationController.cpp 2014-01-10 15:40:52 UTC (rev 161633)
+++ trunk/Source/WebCore/page/animation/AnimationController.cpp 2014-01-10 16:19:06 UTC (rev 161634)
</span><span class="lines">@@ -405,10 +405,8 @@
</span><span class="cx"> void AnimationControllerPrivate::styleAvailable()
</span><span class="cx"> {
</span><span class="cx"> // Go through list of waiters and send them on their way
</span><del>- WaitingAnimationsSet::const_iterator it = m_animationsWaitingForStyle.begin();
- WaitingAnimationsSet::const_iterator end = m_animationsWaitingForStyle.end();
- for (; it != end; ++it)
- (*it)->styleAvailable();
</del><ins>+ for (const auto& waitingAnimation : m_animationsWaitingForStyle)
+ waitingAnimation->styleAvailable();
</ins><span class="cx">
</span><span class="cx"> m_animationsWaitingForStyle.clear();
</span><span class="cx"> }
</span><span class="lines">@@ -451,10 +449,8 @@
</span><span class="cx"> {
</span><span class="cx"> // Go through list of waiters and send them on their way
</span><span class="cx">
</span><del>- WaitingAnimationsSet::const_iterator it = m_animationsWaitingForStartTimeResponse.begin();
- WaitingAnimationsSet::const_iterator end = m_animationsWaitingForStartTimeResponse.end();
- for (; it != end; ++it)
- (*it)->onAnimationStartResponse(time);
</del><ins>+ for (const auto& animation : m_animationsWaitingForStartTimeResponse)
+ animation->onAnimationStartResponse(time);
</ins><span class="cx">
</span><span class="cx"> m_animationsWaitingForStartTimeResponse.clear();
</span><span class="cx"> m_waitingForAsyncStartNotification = false;
</span></span></pre>
</div>
</div>
</body>
</html>