<!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>[164947] 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/164947">164947</a></dd>
<dt>Author</dt> <dd>bburg@apple.com</dd>
<dt>Date</dt> <dd>2014-03-02 12:34:51 -0800 (Sun, 02 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>DocumentLoader should keep maps of ResourceLoaders instead of sets
https://bugs.webkit.org/show_bug.cgi?id=129388
Reviewed by Darin Adler.
For web replay, we need to be able to pull a ResourceLoader instance by
identifier from the DocumentLoader. This is easy to do if we convert
ResourceLoaderSet to ResourceLoaderMap, keyed by the loader's identifier.
Added assertions whenever adding or removing from the map to ensure
that we don't try to add duplicates or resources with zero identifiers.
No new tests required. No functionality was added.
* loader/DocumentLoader.cpp:
(WebCore::cancelAll):
(WebCore::setAllDefersLoading):
(WebCore::areAllLoadersPageCacheAcceptable):
(WebCore::DocumentLoader::addSubresourceLoader):
(WebCore::DocumentLoader::removeSubresourceLoader):
(WebCore::DocumentLoader::addPlugInStreamLoader):
(WebCore::DocumentLoader::removePlugInStreamLoader):
(WebCore::DocumentLoader::subresourceLoaderFinishedLoadingOnePart):
* loader/DocumentLoader.h:
* loader/NetscapePlugInStreamLoader.cpp:
(WebCore::NetscapePlugInStreamLoader::create): Only add the loader
to the document loader's map if it initialized successfully.
The old code was probably leaking resource loaders that failed to
initialize.
* loader/mac/DocumentLoaderMac.cpp:
(WebCore::scheduleAll):
(WebCore::unscheduleAll):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</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="#trunkSourceWebCoreloaderNetscapePlugInStreamLoadercpp">trunk/Source/WebCore/loader/NetscapePlugInStreamLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloadermacDocumentLoaderMaccpp">trunk/Source/WebCore/loader/mac/DocumentLoaderMac.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (164946 => 164947)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-03-02 19:52:16 UTC (rev 164946)
+++ trunk/Source/WebCore/ChangeLog 2014-03-02 20:34:51 UTC (rev 164947)
</span><span class="lines">@@ -1,3 +1,39 @@
</span><ins>+2014-03-02 Brian Burg <bburg@apple.com>
+
+ DocumentLoader should keep maps of ResourceLoaders instead of sets
+ https://bugs.webkit.org/show_bug.cgi?id=129388
+
+ Reviewed by Darin Adler.
+
+ For web replay, we need to be able to pull a ResourceLoader instance by
+ identifier from the DocumentLoader. This is easy to do if we convert
+ ResourceLoaderSet to ResourceLoaderMap, keyed by the loader's identifier.
+
+ Added assertions whenever adding or removing from the map to ensure
+ that we don't try to add duplicates or resources with zero identifiers.
+
+ No new tests required. No functionality was added.
+
+ * loader/DocumentLoader.cpp:
+ (WebCore::cancelAll):
+ (WebCore::setAllDefersLoading):
+ (WebCore::areAllLoadersPageCacheAcceptable):
+ (WebCore::DocumentLoader::addSubresourceLoader):
+ (WebCore::DocumentLoader::removeSubresourceLoader):
+ (WebCore::DocumentLoader::addPlugInStreamLoader):
+ (WebCore::DocumentLoader::removePlugInStreamLoader):
+ (WebCore::DocumentLoader::subresourceLoaderFinishedLoadingOnePart):
+ * loader/DocumentLoader.h:
+ * loader/NetscapePlugInStreamLoader.cpp:
+ (WebCore::NetscapePlugInStreamLoader::create): Only add the loader
+ to the document loader's map if it initialized successfully.
+ The old code was probably leaking resource loaders that failed to
+ initialize.
+
+ * loader/mac/DocumentLoaderMac.cpp:
+ (WebCore::scheduleAll):
+ (WebCore::unscheduleAll):
+
</ins><span class="cx"> 2014-03-02 Dirkjan Ochtman <d.ochtman@activevideo.com>
</span><span class="cx">
</span><span class="cx"> Support ENABLE_ENCRYPTED_MEDIA in cmake builds
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderDocumentLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/DocumentLoader.cpp (164946 => 164947)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/DocumentLoader.cpp 2014-03-02 19:52:16 UTC (rev 164946)
+++ trunk/Source/WebCore/loader/DocumentLoader.cpp 2014-03-02 20:34:51 UTC (rev 164947)
</span><span class="lines">@@ -78,28 +78,26 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-static void cancelAll(const ResourceLoaderSet& loaders)
</del><ins>+static void cancelAll(const ResourceLoaderMap& loaders)
</ins><span class="cx"> {
</span><span class="cx"> Vector<RefPtr<ResourceLoader>> loadersCopy;
</span><del>- copyToVector(loaders, loadersCopy);
- size_t size = loadersCopy.size();
- for (size_t i = 0; i < size; ++i)
- loadersCopy[i]->cancel();
</del><ins>+ copyValuesToVector(loaders, loadersCopy);
+ for (auto& loader : loadersCopy)
+ loader->cancel();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-static void setAllDefersLoading(const ResourceLoaderSet& loaders, bool defers)
</del><ins>+static void setAllDefersLoading(const ResourceLoaderMap& loaders, bool defers)
</ins><span class="cx"> {
</span><span class="cx"> Vector<RefPtr<ResourceLoader>> loadersCopy;
</span><del>- copyToVector(loaders, loadersCopy);
- size_t size = loadersCopy.size();
- for (size_t i = 0; i < size; ++i)
- loadersCopy[i]->setDefersLoading(defers);
</del><ins>+ copyValuesToVector(loaders, loadersCopy);
+ for (auto& loader : loadersCopy)
+ loader->setDefersLoading(defers);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-static bool areAllLoadersPageCacheAcceptable(const ResourceLoaderSet& loaders)
</del><ins>+static bool areAllLoadersPageCacheAcceptable(const ResourceLoaderMap& loaders)
</ins><span class="cx"> {
</span><span class="cx"> Vector<RefPtr<ResourceLoader>> loadersCopy;
</span><del>- copyToVector(loaders, loadersCopy);
</del><ins>+ copyValuesToVector(loaders, loadersCopy);
</ins><span class="cx"> for (auto& loader : loadersCopy) {
</span><span class="cx"> ResourceHandle* handle = loader->handle();
</span><span class="cx"> if (!handle)
</span><span class="lines">@@ -1338,14 +1336,18 @@
</span><span class="cx"> // if we are just starting the main resource load.
</span><span class="cx"> if (!m_gotFirstByte)
</span><span class="cx"> return;
</span><del>- ASSERT(!m_subresourceLoaders.contains(loader));
</del><ins>+ ASSERT(loader->identifier());
+ ASSERT(!m_subresourceLoaders.contains(loader->identifier()));
</ins><span class="cx"> ASSERT(!mainResourceLoader() || mainResourceLoader() != loader);
</span><del>- m_subresourceLoaders.add(loader);
</del><ins>+
+ m_subresourceLoaders.add(loader->identifier(), loader);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void DocumentLoader::removeSubresourceLoader(ResourceLoader* loader)
</span><span class="cx"> {
</span><del>- if (!m_subresourceLoaders.remove(loader))
</del><ins>+ ASSERT(loader->identifier());
+
+ if (!m_subresourceLoaders.remove(loader->identifier()))
</ins><span class="cx"> return;
</span><span class="cx"> checkLoadComplete();
</span><span class="cx"> if (Frame* frame = m_frame)
</span><span class="lines">@@ -1354,12 +1356,18 @@
</span><span class="cx">
</span><span class="cx"> void DocumentLoader::addPlugInStreamLoader(ResourceLoader* loader)
</span><span class="cx"> {
</span><del>- m_plugInStreamLoaders.add(loader);
</del><ins>+ ASSERT(loader->identifier());
+ ASSERT(!m_plugInStreamLoaders.contains(loader->identifier()));
+
+ m_plugInStreamLoaders.add(loader->identifier(), loader);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void DocumentLoader::removePlugInStreamLoader(ResourceLoader* loader)
</span><span class="cx"> {
</span><del>- m_plugInStreamLoaders.remove(loader);
</del><ins>+ ASSERT(loader->identifier());
+ ASSERT(loader == m_plugInStreamLoaders.get(loader->identifier()));
+
+ m_plugInStreamLoaders.remove(loader->identifier());
</ins><span class="cx"> checkLoadComplete();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1484,8 +1492,12 @@
</span><span class="cx">
</span><span class="cx"> void DocumentLoader::subresourceLoaderFinishedLoadingOnePart(ResourceLoader* loader)
</span><span class="cx"> {
</span><del>- m_multipartSubresourceLoaders.add(loader);
- m_subresourceLoaders.remove(loader);
</del><ins>+ ASSERT(loader->identifier());
+ ASSERT(!m_multipartSubresourceLoaders.contains(loader->identifier()));
+ ASSERT(m_subresourceLoaders.contains(loader->identifier()));
+
+ m_multipartSubresourceLoaders.add(loader->identifier(), loader);
+ m_subresourceLoaders.remove(loader->identifier());
</ins><span class="cx"> checkLoadComplete();
</span><span class="cx"> if (Frame* frame = m_frame)
</span><span class="cx"> frame->loader().checkLoadComplete();
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderDocumentLoaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/DocumentLoader.h (164946 => 164947)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/DocumentLoader.h 2014-03-02 19:52:16 UTC (rev 164946)
+++ trunk/Source/WebCore/loader/DocumentLoader.h 2014-03-02 20:34:51 UTC (rev 164947)
</span><span class="lines">@@ -74,7 +74,7 @@
</span><span class="cx"> class SharedBuffer;
</span><span class="cx"> class SubstituteResource;
</span><span class="cx">
</span><del>- typedef HashSet<RefPtr<ResourceLoader>> ResourceLoaderSet;
</del><ins>+ typedef HashMap<unsigned long, RefPtr<ResourceLoader>> ResourceLoaderMap;
</ins><span class="cx"> typedef Vector<ResourceResponse> ResponseVector;
</span><span class="cx">
</span><span class="cx"> class DocumentLoader : public RefCounted<DocumentLoader>, private CachedRawResourceClient {
</span><span class="lines">@@ -331,9 +331,9 @@
</span><span class="cx"> Ref<CachedResourceLoader> m_cachedResourceLoader;
</span><span class="cx">
</span><span class="cx"> CachedResourceHandle<CachedRawResource> m_mainResource;
</span><del>- ResourceLoaderSet m_subresourceLoaders;
- ResourceLoaderSet m_multipartSubresourceLoaders;
- ResourceLoaderSet m_plugInStreamLoaders;
</del><ins>+ ResourceLoaderMap m_subresourceLoaders;
+ ResourceLoaderMap m_multipartSubresourceLoaders;
+ ResourceLoaderMap m_plugInStreamLoaders;
</ins><span class="cx">
</span><span class="cx"> mutable DocumentWriter m_writer;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderNetscapePlugInStreamLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/NetscapePlugInStreamLoader.cpp (164946 => 164947)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/NetscapePlugInStreamLoader.cpp 2014-03-02 19:52:16 UTC (rev 164946)
+++ trunk/Source/WebCore/loader/NetscapePlugInStreamLoader.cpp 2014-03-02 20:34:51 UTC (rev 164947)
</span><span class="lines">@@ -49,10 +49,10 @@
</span><span class="cx"> PassRefPtr<NetscapePlugInStreamLoader> NetscapePlugInStreamLoader::create(Frame* frame, NetscapePlugInStreamLoaderClient* client, const ResourceRequest& request)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<NetscapePlugInStreamLoader> loader(adoptRef(new NetscapePlugInStreamLoader(frame, client)));
</span><del>- loader->documentLoader()->addPlugInStreamLoader(loader.get());
</del><span class="cx"> if (!loader->init(request))
</span><span class="cx"> return 0;
</span><span class="cx">
</span><ins>+ loader->documentLoader()->addPlugInStreamLoader(loader.get());
</ins><span class="cx"> return loader.release();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloadermacDocumentLoaderMaccpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/mac/DocumentLoaderMac.cpp (164946 => 164947)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/mac/DocumentLoaderMac.cpp 2014-03-02 19:52:16 UTC (rev 164946)
+++ trunk/Source/WebCore/loader/mac/DocumentLoaderMac.cpp 2014-03-02 20:34:51 UTC (rev 164947)
</span><span class="lines">@@ -35,22 +35,24 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> #if !PLATFORM(IOS)
</span><del>-static void scheduleAll(const ResourceLoaderSet& loaders, SchedulePair* pair)
</del><ins>+static void scheduleAll(const ResourceLoaderMap& loaders, SchedulePair* pair)
</ins><span class="cx"> {
</span><del>- const ResourceLoaderSet copy = loaders;
- ResourceLoaderSet::const_iterator end = copy.end();
- for (ResourceLoaderSet::const_iterator it = copy.begin(); it != end; ++it)
- if (ResourceHandle* handle = (*it)->handle())
</del><ins>+ Vector<RefPtr<ResourceLoader>> loadersCopy;
+ copyValuesToVector(loaders, loadersCopy);
+ for (auto& loader : loadersCopy) {
+ if (ResourceHandle* handle = loader->handle())
</ins><span class="cx"> handle->schedule(pair);
</span><ins>+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-static void unscheduleAll(const ResourceLoaderSet& loaders, SchedulePair* pair)
</del><ins>+static void unscheduleAll(const ResourceLoaderMap& loaders, SchedulePair* pair)
</ins><span class="cx"> {
</span><del>- const ResourceLoaderSet copy = loaders;
- ResourceLoaderSet::const_iterator end = copy.end();
- for (ResourceLoaderSet::const_iterator it = copy.begin(); it != end; ++it)
- if (ResourceHandle* handle = (*it)->handle())
</del><ins>+ Vector<RefPtr<ResourceLoader>> loadersCopy;
+ copyValuesToVector(loaders, loadersCopy);
+ for (auto& loader : loadersCopy) {
+ if (ResourceHandle* handle = loader->handle())
</ins><span class="cx"> handle->unschedule(pair);
</span><ins>+ }
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>