<!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>[170113] trunk/Source</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/170113">170113</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-06-18 12:40:25 -0700 (Wed, 18 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Adopt modern C++11 loops and fix WebArchive creation functions
https://bugs.webkit.org/show_bug.cgi?id=134032
Reviewed by Andreas Kling.
Source/WebCore:
Use modern loops in a couple of places, fix DocumentLoader::subresources() to return a Vector,
and stop using Vectors of PassRefPtrs.
* WebCore.exp.in:
* dom/Document.cpp:
(WebCore::Document::textInserted):
(WebCore::Document::textRemoved):
(WebCore::Document::textNodesMerged):
* loader/DocumentLoader.cpp:
(WebCore::DocumentLoader::subresources):
(WebCore::DocumentLoader::getSubresources): Deleted.
* loader/DocumentLoader.h:
* loader/appcache/ApplicationCache.cpp:
(WebCore::ApplicationCache::dump):
* loader/appcache/ApplicationCache.h:
(WebCore::ApplicationCache::resources):
(WebCore::ApplicationCache::begin): Deleted.
(WebCore::ApplicationCache::end): Deleted.
* loader/appcache/ApplicationCacheGroup.cpp:
(WebCore::ApplicationCacheGroup::didFinishLoadingManifest):
* loader/appcache/ApplicationCacheHost.cpp:
(WebCore::ApplicationCacheHost::fillResourceList):
* loader/appcache/ApplicationCacheStorage.cpp:
(WebCore::ApplicationCacheStorage::fallbackCacheGroupForURL):
(WebCore::ApplicationCacheStorage::store):
(WebCore::ApplicationCacheStorage::empty):
(WebCore::ApplicationCacheStorage::storeCopyOfCache):
* loader/archive/cf/LegacyWebArchive.cpp:
(WebCore::LegacyWebArchive::create):
(WebCore::LegacyWebArchive::createFromSelection):
* loader/archive/cf/LegacyWebArchive.h:
* xml/XMLHttpRequestProgressEventThrottle.cpp:
(WebCore::XMLHttpRequestProgressEventThrottle::dispatchDeferredEvents):
Source/WebKit/mac:
* WebView/WebArchive.mm:
(-[WebArchive initWithMainResource:subresources:subframeArchives:]):
* WebView/WebDataSource.mm:
(-[WebDataSource subresources]):
Source/WebKit2:
* Shared/APIWebArchive.cpp:
(API::WebArchive::WebArchive):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCoreexpin">trunk/Source/WebCore/WebCore.exp.in</a></li>
<li><a href="#trunkSourceWebCoredomDocumentcpp">trunk/Source/WebCore/dom/Document.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderDocumentLoadercpp">trunk/Source/WebCore/loader/DocumentLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderDocumentLoaderh">trunk/Source/WebCore/loader/DocumentLoader.h</a></li>
<li><a href="#trunkSourceWebCoreloaderappcacheApplicationCachecpp">trunk/Source/WebCore/loader/appcache/ApplicationCache.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderappcacheApplicationCacheh">trunk/Source/WebCore/loader/appcache/ApplicationCache.h</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="#trunkSourceWebCoreloaderappcacheApplicationCacheStoragecpp">trunk/Source/WebCore/loader/appcache/ApplicationCacheStorage.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderarchivecfLegacyWebArchivecpp">trunk/Source/WebCore/loader/archive/cf/LegacyWebArchive.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderarchivecfLegacyWebArchiveh">trunk/Source/WebCore/loader/archive/cf/LegacyWebArchive.h</a></li>
<li><a href="#trunkSourceWebCorexmlXMLHttpRequestProgressEventThrottlecpp">trunk/Source/WebCore/xml/XMLHttpRequestProgressEventThrottle.cpp</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebArchivemm">trunk/Source/WebKit/mac/WebView/WebArchive.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebDataSourcemm">trunk/Source/WebKit/mac/WebView/WebDataSource.mm</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIWebArchivecpp">trunk/Source/WebKit2/Shared/APIWebArchive.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (170112 => 170113)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-06-18 19:19:52 UTC (rev 170112)
+++ trunk/Source/WebCore/ChangeLog 2014-06-18 19:40:25 UTC (rev 170113)
</span><span class="lines">@@ -1,3 +1,44 @@
</span><ins>+2014-06-18 Anders Carlsson <andersca@apple.com>
+
+ Adopt modern C++11 loops and fix WebArchive creation functions
+ https://bugs.webkit.org/show_bug.cgi?id=134032
+
+ Reviewed by Andreas Kling.
+
+ Use modern loops in a couple of places, fix DocumentLoader::subresources() to return a Vector,
+ and stop using Vectors of PassRefPtrs.
+
+ * WebCore.exp.in:
+ * dom/Document.cpp:
+ (WebCore::Document::textInserted):
+ (WebCore::Document::textRemoved):
+ (WebCore::Document::textNodesMerged):
+ * loader/DocumentLoader.cpp:
+ (WebCore::DocumentLoader::subresources):
+ (WebCore::DocumentLoader::getSubresources): Deleted.
+ * loader/DocumentLoader.h:
+ * loader/appcache/ApplicationCache.cpp:
+ (WebCore::ApplicationCache::dump):
+ * loader/appcache/ApplicationCache.h:
+ (WebCore::ApplicationCache::resources):
+ (WebCore::ApplicationCache::begin): Deleted.
+ (WebCore::ApplicationCache::end): Deleted.
+ * loader/appcache/ApplicationCacheGroup.cpp:
+ (WebCore::ApplicationCacheGroup::didFinishLoadingManifest):
+ * loader/appcache/ApplicationCacheHost.cpp:
+ (WebCore::ApplicationCacheHost::fillResourceList):
+ * loader/appcache/ApplicationCacheStorage.cpp:
+ (WebCore::ApplicationCacheStorage::fallbackCacheGroupForURL):
+ (WebCore::ApplicationCacheStorage::store):
+ (WebCore::ApplicationCacheStorage::empty):
+ (WebCore::ApplicationCacheStorage::storeCopyOfCache):
+ * loader/archive/cf/LegacyWebArchive.cpp:
+ (WebCore::LegacyWebArchive::create):
+ (WebCore::LegacyWebArchive::createFromSelection):
+ * loader/archive/cf/LegacyWebArchive.h:
+ * xml/XMLHttpRequestProgressEventThrottle.cpp:
+ (WebCore::XMLHttpRequestProgressEventThrottle::dispatchDeferredEvents):
+
</ins><span class="cx"> 2014-06-18 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Remove duplicate code using sdiv.
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (170112 => 170113)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.exp.in 2014-06-18 19:19:52 UTC (rev 170112)
+++ trunk/Source/WebCore/WebCore.exp.in 2014-06-18 19:40:25 UTC (rev 170113)
</span><span class="lines">@@ -682,7 +682,7 @@
</span><span class="cx"> __ZN7WebCore16IconDatabaseBase4openERKN3WTF6StringES4_
</span><span class="cx"> __ZN7WebCore16LegacyWebArchive19createFromSelectionEPNS_5FrameE
</span><span class="cx"> __ZN7WebCore16LegacyWebArchive21rawDataRepresentationEv
</span><del>-__ZN7WebCore16LegacyWebArchive6createEN3WTF10PassRefPtrINS_15ArchiveResourceEEERNS1_6VectorIS4_Lm0ENS1_15CrashOnOverflowEEERNS5_INS2_IS0_EELm0ES6_EE
</del><ins>+__ZN7WebCore16LegacyWebArchive6createEN3WTF10PassRefPtrINS_15ArchiveResourceEEENS1_6VectorINS1_6RefPtrIS3_EELm0ENS1_15CrashOnOverflowEEENS5_INS6_IS0_EELm0ES8_EE
</ins><span class="cx"> __ZN7WebCore16LegacyWebArchive6createEPNS_12SharedBufferE
</span><span class="cx"> __ZN7WebCore16LegacyWebArchive6createEPNS_4NodeENSt3__18functionIFbRNS_5FrameEEEE
</span><span class="cx"> __ZN7WebCore16LegacyWebArchive6createEPNS_5FrameE
</span><span class="lines">@@ -1640,9 +1640,9 @@
</span><span class="cx"> __ZNK7WebCore14DocumentLoader11responseURLEv
</span><span class="cx"> __ZNK7WebCore14DocumentLoader11subresourceERKNS_3URLE
</span><span class="cx"> __ZNK7WebCore14DocumentLoader12mainResourceEv
</span><ins>+__ZNK7WebCore14DocumentLoader12subresourcesEv
</ins><span class="cx"> __ZNK7WebCore14DocumentLoader13urlForHistoryEv
</span><span class="cx"> __ZNK7WebCore14DocumentLoader14unreachableURLEv
</span><del>-__ZNK7WebCore14DocumentLoader15getSubresourcesERN3WTF6VectorINS1_10PassRefPtrINS_15ArchiveResourceEEELm0ENS1_15CrashOnOverflowEEE
</del><span class="cx"> __ZNK7WebCore14DocumentLoader15originalRequestEv
</span><span class="cx"> __ZNK7WebCore14DocumentLoader16mainResourceDataEv
</span><span class="cx"> __ZNK7WebCore14DocumentLoader17parsedArchiveDataEv
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (170112 => 170113)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.cpp 2014-06-18 19:19:52 UTC (rev 170112)
+++ trunk/Source/WebCore/dom/Document.cpp 2014-06-18 19:40:25 UTC (rev 170113)
</span><span class="lines">@@ -3611,9 +3611,8 @@
</span><span class="cx"> void Document::textInserted(Node* text, unsigned offset, unsigned length)
</span><span class="cx"> {
</span><span class="cx"> if (!m_ranges.isEmpty()) {
</span><del>- HashSet<Range*>::const_iterator end = m_ranges.end();
- for (HashSet<Range*>::const_iterator it = m_ranges.begin(); it != end; ++it)
- (*it)->textInserted(text, offset, length);
</del><ins>+ for (auto& range : m_ranges)
+ range->textInserted(text, offset, length);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Update the markers for spelling and grammar checking.
</span><span class="lines">@@ -3623,9 +3622,8 @@
</span><span class="cx"> void Document::textRemoved(Node* text, unsigned offset, unsigned length)
</span><span class="cx"> {
</span><span class="cx"> if (!m_ranges.isEmpty()) {
</span><del>- HashSet<Range*>::const_iterator end = m_ranges.end();
- for (HashSet<Range*>::const_iterator it = m_ranges.begin(); it != end; ++it)
- (*it)->textRemoved(text, offset, length);
</del><ins>+ for (auto& range : m_ranges)
+ range->textRemoved(text, offset, length);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Update the markers for spelling and grammar checking.
</span><span class="lines">@@ -3637,9 +3635,8 @@
</span><span class="cx"> {
</span><span class="cx"> if (!m_ranges.isEmpty()) {
</span><span class="cx"> NodeWithIndex oldNodeWithIndex(oldNode);
</span><del>- HashSet<Range*>::const_iterator end = m_ranges.end();
- for (HashSet<Range*>::const_iterator it = m_ranges.begin(); it != end; ++it)
- (*it)->textNodesMerged(oldNodeWithIndex, offset);
</del><ins>+ for (auto& range : m_ranges)
+ range->textNodesMerged(oldNodeWithIndex, offset);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // FIXME: This should update markers for spelling and grammar checking.
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderDocumentLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/DocumentLoader.cpp (170112 => 170113)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/DocumentLoader.cpp 2014-06-18 19:19:52 UTC (rev 170112)
+++ trunk/Source/WebCore/loader/DocumentLoader.cpp 2014-06-18 19:40:25 UTC (rev 170113)
</span><span class="lines">@@ -1105,20 +1105,19 @@
</span><span class="cx"> return ArchiveResource::create(data->sharedBuffer(), url, resource->response());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void DocumentLoader::getSubresources(Vector<PassRefPtr<ArchiveResource>>& subresources) const
</del><ins>+Vector<RefPtr<ArchiveResource>> DocumentLoader::subresources() const
</ins><span class="cx"> {
</span><span class="cx"> if (!isCommitted())
</span><del>- return;
</del><ins>+ return { };
</ins><span class="cx">
</span><del>- const CachedResourceLoader::DocumentResourceMap& allResources = m_cachedResourceLoader->allCachedResources();
- CachedResourceLoader::DocumentResourceMap::const_iterator end = allResources.end();
- for (CachedResourceLoader::DocumentResourceMap::const_iterator it = allResources.begin(); it != end; ++it) {
- RefPtr<ArchiveResource> subresource = this->subresource(URL(ParsedURLString, it->value->url()));
- if (subresource)
- subresources.append(subresource.release());
</del><ins>+ Vector<RefPtr<ArchiveResource>> subresources;
+
+ for (auto& cachedResourceHandle : m_cachedResourceLoader->allCachedResources().values()) {
+ if (RefPtr<ArchiveResource> subresource = this->subresource(URL(ParsedURLString, cachedResourceHandle->url())))
+ subresources.append(std::move(subresource));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- return;
</del><ins>+ return subresources;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void DocumentLoader::deliverSubstituteResourcesAfterDelay()
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderDocumentLoaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/DocumentLoader.h (170112 => 170113)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/DocumentLoader.h 2014-06-18 19:19:52 UTC (rev 170112)
+++ trunk/Source/WebCore/loader/DocumentLoader.h 2014-06-18 19:40:25 UTC (rev 170113)
</span><span class="lines">@@ -162,9 +162,8 @@
</span><span class="cx"> // Return an ArchiveResource for the URL, either creating from live data or
</span><span class="cx"> // pulling from the ArchiveResourceCollection
</span><span class="cx"> PassRefPtr<ArchiveResource> subresource(const URL&) const;
</span><del>- void getSubresources(Vector<PassRefPtr<ArchiveResource>>&) const;
</del><ins>+ Vector<RefPtr<ArchiveResource>> subresources() const;
</ins><span class="cx">
</span><del>-
</del><span class="cx"> #ifndef NDEBUG
</span><span class="cx"> bool isSubstituteLoadPending(ResourceLoader*) const;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderappcacheApplicationCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/appcache/ApplicationCache.cpp (170112 => 170113)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/appcache/ApplicationCache.cpp 2014-06-18 19:19:52 UTC (rev 170112)
+++ trunk/Source/WebCore/loader/appcache/ApplicationCache.cpp 2014-06-18 19:40:25 UTC (rev 170113)
</span><span class="lines">@@ -222,11 +222,9 @@
</span><span class="cx"> #ifndef NDEBUG
</span><span class="cx"> void ApplicationCache::dump()
</span><span class="cx"> {
</span><del>- HashMap<String, RefPtr<ApplicationCacheResource>>::const_iterator end = m_resources.end();
-
- for (HashMap<String, RefPtr<ApplicationCacheResource>>::const_iterator it = m_resources.begin(); it != end; ++it) {
- printf("%s ", it->key.ascii().data());
- ApplicationCacheResource::dumpType(it->value->type());
</del><ins>+ for (const auto& urlAndResource : m_resources) {
+ printf("%s ", urlAndResource.key.utf8().data());
+ ApplicationCacheResource::dumpType(urlAndResource.value->type());
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderappcacheApplicationCacheh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/appcache/ApplicationCache.h (170112 => 170113)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/appcache/ApplicationCache.h 2014-06-18 19:19:52 UTC (rev 170112)
+++ trunk/Source/WebCore/loader/appcache/ApplicationCache.h 2014-06-18 19:40:25 UTC (rev 170113)
</span><span class="lines">@@ -81,8 +81,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> typedef HashMap<String, RefPtr<ApplicationCacheResource>> ResourceMap;
</span><del>- ResourceMap::const_iterator begin() const { return m_resources.begin(); }
- ResourceMap::const_iterator end() const { return m_resources.end(); }
</del><ins>+ const ResourceMap& resources() const { return m_resources; }
</ins><span class="cx">
</span><span class="cx"> void setStorageID(unsigned storageID) { m_storageID = storageID; }
</span><span class="cx"> unsigned storageID() const { return m_storageID; }
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderappcacheApplicationCacheGroupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/appcache/ApplicationCacheGroup.cpp (170112 => 170113)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/appcache/ApplicationCacheGroup.cpp 2014-06-18 19:19:52 UTC (rev 170112)
+++ trunk/Source/WebCore/loader/appcache/ApplicationCacheGroup.cpp 2014-06-18 19:40:25 UTC (rev 170113)
</span><span class="lines">@@ -765,7 +765,7 @@
</span><span class="cx"> ASSERT(m_pendingEntries.isEmpty());
</span><span class="cx">
</span><span class="cx"> if (isUpgradeAttempt) {
</span><del>- for (const auto& urlAndResource : *m_newestCache) {
</del><ins>+ for (const auto& urlAndResource : m_newestCache->resources()) {
</ins><span class="cx"> unsigned type = urlAndResource.value->type();
</span><span class="cx"> if (type & ApplicationCacheResource::Master)
</span><span class="cx"> addEntry(urlAndResource.key, type);
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderappcacheApplicationCacheHostcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/appcache/ApplicationCacheHost.cpp (170112 => 170113)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/appcache/ApplicationCacheHost.cpp 2014-06-18 19:19:52 UTC (rev 170112)
+++ trunk/Source/WebCore/loader/appcache/ApplicationCacheHost.cpp 2014-06-18 19:40:25 UTC (rev 170113)
</span><span class="lines">@@ -286,15 +286,17 @@
</span><span class="cx"> ApplicationCache* cache = applicationCache();
</span><span class="cx"> if (!cache || !cache->isComplete())
</span><span class="cx"> return;
</span><del>-
- for (const auto& urlAndResource : *cache) {
- RefPtr<ApplicationCacheResource> resource = urlAndResource.value;
</del><ins>+
+ for (const auto& urlAndResource : cache->resources()) {
+ ApplicationCacheResource* resource = urlAndResource.value.get();
+
</ins><span class="cx"> unsigned type = resource->type();
</span><del>- bool isMaster = type & ApplicationCacheResource::Master;
</del><ins>+ bool isMaster = type & ApplicationCacheResource::Master;
</ins><span class="cx"> bool isManifest = type & ApplicationCacheResource::Manifest;
</span><span class="cx"> bool isExplicit = type & ApplicationCacheResource::Explicit;
</span><del>- bool isForeign = type & ApplicationCacheResource::Foreign;
</del><ins>+ bool isForeign = type & ApplicationCacheResource::Foreign;
</ins><span class="cx"> bool isFallback = type & ApplicationCacheResource::Fallback;
</span><ins>+
</ins><span class="cx"> resources->append(ResourceInfo(resource->url(), isMaster, isManifest, isFallback, isForeign, isExplicit, resource->estimatedSizeInStorage()));
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderappcacheApplicationCacheStoragecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/appcache/ApplicationCacheStorage.cpp (170112 => 170113)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/appcache/ApplicationCacheStorage.cpp 2014-06-18 19:19:52 UTC (rev 170112)
+++ trunk/Source/WebCore/loader/appcache/ApplicationCacheStorage.cpp 2014-06-18 19:40:25 UTC (rev 170113)
</span><span class="lines">@@ -275,10 +275,7 @@
</span><span class="cx"> ASSERT(!url.hasFragmentIdentifier());
</span><span class="cx">
</span><span class="cx"> // Check if an appropriate 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 (auto group : m_cachesInMemory.values()) {
</ins><span class="cx"> ASSERT(!group->isObsolete());
</span><span class="cx">
</span><span class="cx"> if (ApplicationCache* cache = group->newestCache()) {
</span><span class="lines">@@ -741,17 +738,14 @@
</span><span class="cx"> unsigned cacheStorageID = static_cast<unsigned>(m_database.lastInsertRowID());
</span><span class="cx">
</span><span class="cx"> // Store all resources
</span><del>- {
- ApplicationCache::ResourceMap::const_iterator end = cache->end();
- for (ApplicationCache::ResourceMap::const_iterator it = cache->begin(); it != end; ++it) {
- unsigned oldStorageID = it->value->storageID();
- if (!store(it->value.get(), cacheStorageID))
- return false;
</del><ins>+ for (auto& resource : cache->resources().values()) {
+ unsigned oldStorageID = resource->storageID();
+ if (!store(resource.get(), cacheStorageID))
+ return false;
</ins><span class="cx">
</span><del>- // Storing the resource succeeded. Log its old storageID in case
- // it needs to be restored later.
- storageIDJournal->add(it->value.get(), oldStorageID);
- }
</del><ins>+ // Storing the resource succeeded. Log its old storageID in case
+ // it needs to be restored later.
+ storageIDJournal->add(resource.get(), oldStorageID);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Store the online whitelist
</span><span class="lines">@@ -1293,10 +1287,9 @@
</span><span class="cx"> // Clear the storage IDs for the caches in memory.
</span><span class="cx"> // The caches will still work, but cached resources will not be saved to disk
</span><span class="cx"> // until a cache update process has been initiated.
</span><del>- CacheGroupMap::const_iterator end = m_cachesInMemory.end();
- for (CacheGroupMap::const_iterator it = m_cachesInMemory.begin(); it != end; ++it)
- it->value->clearStorageID();
-
</del><ins>+ for (auto group : m_cachesInMemory.values())
+ group->clearStorageID();
+
</ins><span class="cx"> checkForDeletedResources();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1357,10 +1350,7 @@
</span><span class="cx"> cacheCopy->setFallbackURLs(cache->fallbackURLs());
</span><span class="cx">
</span><span class="cx"> // Traverse the cache and add copies of all resources.
</span><del>- ApplicationCache::ResourceMap::const_iterator end = cache->end();
- for (ApplicationCache::ResourceMap::const_iterator it = cache->begin(); it != end; ++it) {
- ApplicationCacheResource* resource = it->value.get();
-
</del><ins>+ for (auto& resource : cache->resources().values()) {
</ins><span class="cx"> RefPtr<ApplicationCacheResource> resourceCopy = ApplicationCacheResource::create(resource->url(), resource->response(), resource->type(), resource->data(), resource->path());
</span><span class="cx">
</span><span class="cx"> cacheCopy->addResource(resourceCopy.release());
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderarchivecfLegacyWebArchivecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/archive/cf/LegacyWebArchive.cpp (170112 => 170113)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/archive/cf/LegacyWebArchive.cpp 2014-06-18 19:19:52 UTC (rev 170112)
+++ trunk/Source/WebCore/loader/archive/cf/LegacyWebArchive.cpp 2014-06-18 19:40:25 UTC (rev 170113)
</span><span class="lines">@@ -237,7 +237,7 @@
</span><span class="cx"> return adoptRef(new LegacyWebArchive);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<LegacyWebArchive> LegacyWebArchive::create(PassRefPtr<ArchiveResource> mainResource, Vector<PassRefPtr<ArchiveResource>>& subresources, Vector<PassRefPtr<LegacyWebArchive>>& subframeArchives)
</del><ins>+PassRefPtr<LegacyWebArchive> LegacyWebArchive::create(PassRefPtr<ArchiveResource> mainResource, Vector<RefPtr<ArchiveResource>> subresources, Vector<RefPtr<LegacyWebArchive>> subframeArchives)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(mainResource);
</span><span class="cx"> if (!mainResource)
</span><span class="lines">@@ -247,10 +247,10 @@
</span><span class="cx"> archive->setMainResource(mainResource);
</span><span class="cx">
</span><span class="cx"> for (unsigned i = 0; i < subresources.size(); ++i)
</span><del>- archive->addSubresource(subresources[i]);
</del><ins>+ archive->addSubresource(std::move(subresources[i]));
</ins><span class="cx">
</span><span class="cx"> for (unsigned i = 0; i < subframeArchives.size(); ++i)
</span><del>- archive->addSubframeArchive(subframeArchives[i]);
</del><ins>+ archive->addSubframeArchive(std::move(subframeArchives[i]));
</ins><span class="cx">
</span><span class="cx"> return archive.release();
</span><span class="cx"> }
</span><span class="lines">@@ -461,19 +461,15 @@
</span><span class="cx"> if (!documentLoader)
</span><span class="cx"> return 0;
</span><span class="cx">
</span><del>- Vector<PassRefPtr<LegacyWebArchive>> subframeArchives;
</del><ins>+ Vector<RefPtr<LegacyWebArchive>> subframeArchives;
</ins><span class="cx">
</span><del>- unsigned children = frame->tree().childCount();
- for (unsigned i = 0; i < children; ++i) {
- RefPtr<LegacyWebArchive> childFrameArchive = create(frame->tree().child(i));
- if (childFrameArchive)
- subframeArchives.append(childFrameArchive.release());
</del><ins>+ for (unsigned i = 0; i < frame->tree().childCount(); ++i) {
+ if (RefPtr<LegacyWebArchive> childFrameArchive = create(frame->tree().child(i)))
+ subframeArchives.append(std::move(childFrameArchive));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- Vector<PassRefPtr<ArchiveResource>> subresources;
- documentLoader->getSubresources(subresources);
-
- return create(documentLoader->mainResource(), subresources, subframeArchives);
</del><ins>+ auto subresources = documentLoader->subresources();
+ return create(documentLoader->mainResource(), std::move(subresources), std::move(subframeArchives));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PassRefPtr<LegacyWebArchive> LegacyWebArchive::create(Range* range)
</span><span class="lines">@@ -512,8 +508,8 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<ArchiveResource> mainResource = ArchiveResource::create(utf8Buffer(markupString), responseURL, response.mimeType(), "UTF-8", frame->tree().uniqueName());
</span><span class="cx">
</span><del>- Vector<PassRefPtr<LegacyWebArchive>> subframeArchives;
- Vector<PassRefPtr<ArchiveResource>> subresources;
</del><ins>+ Vector<RefPtr<LegacyWebArchive>> subframeArchives;
+ Vector<RefPtr<ArchiveResource>> subresources;
</ins><span class="cx"> HashSet<URL> uniqueSubresources;
</span><span class="cx">
</span><span class="cx"> size_t nodesSize = nodes.size();
</span><span class="lines">@@ -525,28 +521,25 @@
</span><span class="cx"> if (frameFilter && !frameFilter(*childFrame))
</span><span class="cx"> continue;
</span><span class="cx">
</span><del>- RefPtr<LegacyWebArchive> subframeArchive = create(childFrame->document(), frameFilter);
-
- if (subframeArchive)
- subframeArchives.append(subframeArchive);
</del><ins>+ if (RefPtr<LegacyWebArchive> subframeArchive = create(childFrame->document(), frameFilter))
+ subframeArchives.append(std::move(subframeArchive));
</ins><span class="cx"> else
</span><span class="cx"> LOG_ERROR("Unabled to archive subframe %s", childFrame->tree().uniqueName().string().utf8().data());
</span><ins>+
</ins><span class="cx"> } else {
</span><span class="cx"> ListHashSet<URL> subresourceURLs;
</span><span class="cx"> node.getSubresourceURLs(subresourceURLs);
</span><span class="cx">
</span><span class="cx"> DocumentLoader* documentLoader = frame->loader().documentLoader();
</span><del>- ListHashSet<URL>::iterator iterEnd = subresourceURLs.end();
- for (ListHashSet<URL>::iterator iter = subresourceURLs.begin(); iter != iterEnd; ++iter) {
- const URL& subresourceURL = *iter;
</del><ins>+
+ for (const auto& subresourceURL : subresourceURLs) {
</ins><span class="cx"> if (uniqueSubresources.contains(subresourceURL))
</span><span class="cx"> continue;
</span><span class="cx">
</span><span class="cx"> uniqueSubresources.add(subresourceURL);
</span><span class="cx">
</span><del>- RefPtr<ArchiveResource> resource = documentLoader->subresource(subresourceURL);
- if (resource) {
- subresources.append(resource.release());
</del><ins>+ if (RefPtr<ArchiveResource> resource = documentLoader->subresource(subresourceURL)) {
+ subresources.append(std::move(resource));
</ins><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -557,9 +550,9 @@
</span><span class="cx"> CachedResource* cachedResource = memoryCache()->resourceForRequest(request, frame->page()->sessionID());
</span><span class="cx"> if (cachedResource) {
</span><span class="cx"> ResourceBuffer* data = cachedResource->resourceBuffer();
</span><del>- resource = ArchiveResource::create(data ? data->sharedBuffer() : 0, subresourceURL, cachedResource->response());
- if (resource) {
- subresources.append(resource.release());
</del><ins>+
+ if (RefPtr<ArchiveResource> resource = ArchiveResource::create(data ? data->sharedBuffer() : 0, subresourceURL, cachedResource->response())) {
+ subresources.append(std::move(resource));
</ins><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -581,7 +574,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- return create(mainResource.release(), subresources, subframeArchives);
</del><ins>+ return create(mainResource.release(), subresources, std::move(subframeArchives));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PassRefPtr<LegacyWebArchive> LegacyWebArchive::createFromSelection(Frame* frame)
</span><span class="lines">@@ -612,14 +605,7 @@
</span><span class="cx"> String iframeMarkup = "<iframe frameborder=\"no\" marginwidth=\"0\" marginheight=\"0\" width=\"98%%\" height=\"98%%\" src=\"" + frame->loader().documentLoader()->response().url().string() + "\"></iframe>";
</span><span class="cx"> RefPtr<ArchiveResource> iframeResource = ArchiveResource::create(utf8Buffer(iframeMarkup), blankURL(), "text/html", "UTF-8", String());
</span><span class="cx">
</span><del>- Vector<PassRefPtr<ArchiveResource>> subresources;
-
- Vector<PassRefPtr<LegacyWebArchive>> subframeArchives;
- subframeArchives.append(archive);
-
- archive = create(iframeResource.release(), subresources, subframeArchives);
-
- return archive.release();
</del><ins>+ return create(iframeResource.release(), Vector<RefPtr<ArchiveResource>> { }, Vector<RefPtr<LegacyWebArchive>> { archive });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderarchivecfLegacyWebArchiveh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/archive/cf/LegacyWebArchive.h (170112 => 170113)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/archive/cf/LegacyWebArchive.h 2014-06-18 19:19:52 UTC (rev 170112)
+++ trunk/Source/WebCore/loader/archive/cf/LegacyWebArchive.h 2014-06-18 19:40:25 UTC (rev 170113)
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx"> static PassRefPtr<LegacyWebArchive> create();
</span><span class="cx"> static PassRefPtr<LegacyWebArchive> create(SharedBuffer*);
</span><span class="cx"> static PassRefPtr<LegacyWebArchive> create(const URL&, SharedBuffer*);
</span><del>- static PassRefPtr<LegacyWebArchive> create(PassRefPtr<ArchiveResource> mainResource, Vector<PassRefPtr<ArchiveResource>>& subresources, Vector<PassRefPtr<LegacyWebArchive>>& subframeArchives);
</del><ins>+ static PassRefPtr<LegacyWebArchive> create(PassRefPtr<ArchiveResource> mainResource, Vector<RefPtr<ArchiveResource>> subresources, Vector<RefPtr<LegacyWebArchive>> subframeArchives);
</ins><span class="cx"> static PassRefPtr<LegacyWebArchive> create(Node*, std::function<bool (Frame&)> frameFilter = nullptr);
</span><span class="cx"> static PassRefPtr<LegacyWebArchive> create(Frame*);
</span><span class="cx"> static PassRefPtr<LegacyWebArchive> createFromSelection(Frame*);
</span></span></pre></div>
<a id="trunkSourceWebCorexmlXMLHttpRequestProgressEventThrottlecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/xml/XMLHttpRequestProgressEventThrottle.cpp (170112 => 170113)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/xml/XMLHttpRequestProgressEventThrottle.cpp 2014-06-18 19:19:52 UTC (rev 170112)
+++ trunk/Source/WebCore/xml/XMLHttpRequestProgressEventThrottle.cpp 2014-06-18 19:40:25 UTC (rev 170113)
</span><span class="lines">@@ -140,16 +140,13 @@
</span><span class="cx"> m_deferEvents = false;
</span><span class="cx">
</span><span class="cx"> // Take over the deferred events before dispatching them which can potentially add more.
</span><del>- Vector<RefPtr<Event>> deferredEvents;
- m_deferredEvents.swap(deferredEvents);
</del><ins>+ auto deferredEvents = std::move(m_deferredEvents);
</ins><span class="cx">
</span><span class="cx"> RefPtr<Event> deferredProgressEvent = m_deferredProgressEvent;
</span><del>- m_deferredProgressEvent = 0;
</del><ins>+ m_deferredProgressEvent = nullptr;
</ins><span class="cx">
</span><del>- Vector<RefPtr<Event>>::const_iterator it = deferredEvents.begin();
- const Vector<RefPtr<Event>>::const_iterator end = deferredEvents.end();
- for (; it != end; ++it)
- dispatchEvent(*it);
</del><ins>+ for (auto& deferredEvent : deferredEvents)
+ dispatchEvent(deferredEvent.release());
</ins><span class="cx">
</span><span class="cx"> // The progress event will be in the m_deferredEvents vector if the load was finished while suspended.
</span><span class="cx"> // If not, just send the most up-to-date progress on resume.
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (170112 => 170113)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2014-06-18 19:19:52 UTC (rev 170112)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-06-18 19:40:25 UTC (rev 170113)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-06-18 Anders Carlsson <andersca@apple.com>
+
+ Adopt modern C++11 loops and fix WebArchive creation functions
+ https://bugs.webkit.org/show_bug.cgi?id=134032
+
+ Reviewed by Andreas Kling.
+
+ * WebView/WebArchive.mm:
+ (-[WebArchive initWithMainResource:subresources:subframeArchives:]):
+ * WebView/WebDataSource.mm:
+ (-[WebDataSource subresources]):
+
</ins><span class="cx"> 2014-06-15 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Add an autorelease() member function to RetainPtr
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebArchivemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebArchive.mm (170112 => 170113)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebArchive.mm 2014-06-18 19:19:52 UTC (rev 170112)
+++ trunk/Source/WebKit/mac/WebView/WebArchive.mm 2014-06-18 19:40:25 UTC (rev 170113)
</span><span class="lines">@@ -178,24 +178,22 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<ArchiveResource> coreMainResource = mainResource ? [mainResource _coreResource] : 0;
</span><span class="cx">
</span><del>- Vector<PassRefPtr<ArchiveResource>> coreResources;
- NSEnumerator *enumerator = [subresources objectEnumerator];
- WebResource *subresource;
- while ((subresource = [enumerator nextObject]) != nil)
</del><ins>+ Vector<RefPtr<ArchiveResource>> coreResources;
+ for (WebResource *subresource in subresources)
</ins><span class="cx"> coreResources.append([subresource _coreResource]);
</span><span class="cx">
</span><del>- Vector<PassRefPtr<LegacyWebArchive>> coreArchives;
- enumerator = [subframeArchives objectEnumerator];
- WebArchive *subframeArchive;
- while ((subframeArchive = [enumerator nextObject]) != nil)
</del><ins>+ Vector<RefPtr<LegacyWebArchive>> coreArchives;
+ for (WebArchive *subframeArchive in subframeArchives)
</ins><span class="cx"> coreArchives.append([subframeArchive->_private coreArchive]);
</span><span class="cx">
</span><del>- [_private setCoreArchive:LegacyWebArchive::create(coreMainResource.release(), coreResources, coreArchives)];
- if (![_private coreArchive]) {
</del><ins>+ RefPtr<LegacyWebArchive> coreArchive = LegacyWebArchive::create(coreMainResource.release(), std::move(coreResources), std::move(coreArchives));
+ if (!coreArchive) {
</ins><span class="cx"> [self release];
</span><span class="cx"> return nil;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ [_private setCoreArchive:coreArchive.release()];
+
</ins><span class="cx"> return self;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebDataSourcemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebDataSource.mm (170112 => 170113)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebDataSource.mm 2014-06-18 19:19:52 UTC (rev 170112)
+++ trunk/Source/WebKit/mac/WebView/WebDataSource.mm 2014-06-18 19:40:25 UTC (rev 170113)
</span><span class="lines">@@ -606,19 +606,15 @@
</span><span class="cx">
</span><span class="cx"> - (NSArray *)subresources
</span><span class="cx"> {
</span><del>- Vector<PassRefPtr<ArchiveResource>> coreSubresources;
- toPrivate(_private)->loader->getSubresources(coreSubresources);
</del><ins>+ auto coreSubresources = toPrivate(_private)->loader->subresources();
</ins><span class="cx">
</span><del>- NSMutableArray *subresources = [[NSMutableArray alloc] initWithCapacity:coreSubresources.size()];
- for (unsigned i = 0; i < coreSubresources.size(); ++i) {
- WebResource *resource = [[WebResource alloc] _initWithCoreResource:coreSubresources[i]];
- if (resource) {
- [subresources addObject:resource];
- [resource release];
- }
</del><ins>+ auto subresources = adoptNS([[NSMutableArray alloc] initWithCapacity:coreSubresources.size()]);
+ for (const auto& coreSubresource : coreSubresources) {
+ if (auto resource = adoptNS([[WebResource alloc] _initWithCoreResource:coreSubresource]))
+ [subresources addObject:resource.get()];
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- return [subresources autorelease];
</del><ins>+ return subresources.autorelease();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (WebResource *)subresourceForURL:(NSURL *)URL
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (170112 => 170113)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-06-18 19:19:52 UTC (rev 170112)
+++ trunk/Source/WebKit2/ChangeLog 2014-06-18 19:40:25 UTC (rev 170113)
</span><span class="lines">@@ -1,5 +1,15 @@
</span><span class="cx"> 2014-06-18 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><ins>+ Adopt modern C++11 loops and fix WebArchive creation functions
+ https://bugs.webkit.org/show_bug.cgi?id=134032
+
+ Reviewed by Andreas Kling.
+
+ * Shared/APIWebArchive.cpp:
+ (API::WebArchive::WebArchive):
+
+2014-06-18 Anders Carlsson <andersca@apple.com>
+
</ins><span class="cx"> Give WKWebView on iOS a mobile user agent
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=134034
</span><span class="cx"> <rdar://problem/17346489>
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIWebArchivecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/APIWebArchive.cpp (170112 => 170113)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/APIWebArchive.cpp 2014-06-18 19:19:52 UTC (rev 170112)
+++ trunk/Source/WebKit2/Shared/APIWebArchive.cpp 2014-06-18 19:40:25 UTC (rev 170113)
</span><span class="lines">@@ -65,21 +65,24 @@
</span><span class="cx"> {
</span><span class="cx"> RefPtr<ArchiveResource> coreMainResource = m_cachedMainResource->coreArchiveResource();
</span><span class="cx">
</span><del>- Vector<PassRefPtr<ArchiveResource>> coreArchiveResources;
</del><ins>+ Vector<RefPtr<ArchiveResource>> coreArchiveResources;
+ coreArchiveResources.reserveInitialCapacity(m_cachedSubresources->size());
</ins><span class="cx"> for (size_t i = 0; i < m_cachedSubresources->size(); ++i) {
</span><span class="cx"> RefPtr<WebArchiveResource> resource = m_cachedSubresources->at<WebArchiveResource>(i);
</span><span class="cx"> ASSERT(resource);
</span><del>- coreArchiveResources.append(resource->coreArchiveResource());
</del><ins>+ coreArchiveResources.uncheckedAppend(resource->coreArchiveResource());
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- Vector<PassRefPtr<LegacyWebArchive>> coreSubframeLegacyWebArchives;
</del><ins>+ Vector<RefPtr<LegacyWebArchive>> coreSubframeLegacyWebArchives;
+ coreSubframeLegacyWebArchives.reserveInitialCapacity(m_cachedSubframeArchives->size());
+
</ins><span class="cx"> for (size_t i = 0; i < m_cachedSubframeArchives->size(); ++i) {
</span><span class="cx"> RefPtr<WebArchive> subframeWebArchive = m_cachedSubframeArchives->at<WebArchive>(i);
</span><span class="cx"> ASSERT(subframeWebArchive);
</span><del>- coreSubframeLegacyWebArchives.append(subframeWebArchive->coreLegacyWebArchive());
</del><ins>+ coreSubframeLegacyWebArchives.uncheckedAppend(subframeWebArchive->coreLegacyWebArchive());
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- m_legacyWebArchive = LegacyWebArchive::create(coreMainResource.release(), coreArchiveResources, coreSubframeLegacyWebArchives);
</del><ins>+ m_legacyWebArchive = LegacyWebArchive::create(coreMainResource.release(), std::move(coreArchiveResources), std::move(coreSubframeLegacyWebArchives));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WebArchive::WebArchive(API::Data* data)
</span></span></pre>
</div>
</div>
</body>
</html>