<!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>[167743] 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/167743">167743</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2014-04-23 21:11:50 -0700 (Wed, 23 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>CachedResourceLoader hoards URLs indefinitely for no good reason.
<https://webkit.org/b/132102>
<rdar://problem/16708265>
Since we don't care about CachedResourceLoader::m_validatedURL's after
the Document has finished dispatching its initial load event, clear the
set at that point, and don't add any new URLs to it.
Reviewed by Anders Carlsson.
* dom/Document.cpp:
(WebCore::Document::dispatchWindowLoadEvent):
* loader/cache/CachedResourceLoader.cpp:
(WebCore::CachedResourceLoader::requestResource):
(WebCore::CachedResourceLoader::documentDidFinishLoadEvent):
* loader/cache/CachedResourceLoader.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomDocumentcpp">trunk/Source/WebCore/dom/Document.cpp</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedResourceLoadercpp">trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedResourceLoaderh">trunk/Source/WebCore/loader/cache/CachedResourceLoader.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (167742 => 167743)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-04-24 03:56:09 UTC (rev 167742)
+++ trunk/Source/WebCore/ChangeLog 2014-04-24 04:11:50 UTC (rev 167743)
</span><span class="lines">@@ -1,5 +1,24 @@
</span><span class="cx"> 2014-04-23 Andreas Kling <akling@apple.com>
</span><span class="cx">
</span><ins>+ CachedResourceLoader hoards URLs indefinitely for no good reason.
+ <https://webkit.org/b/132102>
+ <rdar://problem/16708265>
+
+ Since we don't care about CachedResourceLoader::m_validatedURL's after
+ the Document has finished dispatching its initial load event, clear the
+ set at that point, and don't add any new URLs to it.
+
+ Reviewed by Anders Carlsson.
+
+ * dom/Document.cpp:
+ (WebCore::Document::dispatchWindowLoadEvent):
+ * loader/cache/CachedResourceLoader.cpp:
+ (WebCore::CachedResourceLoader::requestResource):
+ (WebCore::CachedResourceLoader::documentDidFinishLoadEvent):
+ * loader/cache/CachedResourceLoader.h:
+
+2014-04-23 Andreas Kling <akling@apple.com>
+
</ins><span class="cx"> Canvas cache of clean URLs can grow without bounds.
</span><span class="cx"> <https://webkit.org/b/132091>
</span><span class="cx"> <rdar://problem/16695665>
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (167742 => 167743)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.cpp 2014-04-24 03:56:09 UTC (rev 167742)
+++ trunk/Source/WebCore/dom/Document.cpp 2014-04-24 04:11:50 UTC (rev 167743)
</span><span class="lines">@@ -3697,6 +3697,8 @@
</span><span class="cx"> return;
</span><span class="cx"> m_domWindow->dispatchLoadEvent();
</span><span class="cx"> m_loadEventFinished = true;
</span><ins>+ if (m_cachedResourceLoader)
+ m_cachedResourceLoader->documentDidFinishLoadEvent();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Document::enqueueWindowEvent(PassRefPtr<Event> event)
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedResourceLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp (167742 => 167743)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp 2014-04-24 03:56:09 UTC (rev 167742)
+++ trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp 2014-04-24 04:11:50 UTC (rev 167743)
</span><span class="lines">@@ -477,7 +477,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (!request.resourceRequest().url().protocolIsData())
</del><ins>+ if (document() && !document()->loadEventFinished() && !request.resourceRequest().url().protocolIsData())
</ins><span class="cx"> m_validatedURLs.add(request.resourceRequest().url());
</span><span class="cx">
</span><span class="cx"> ASSERT(resource->url() == url.string());
</span><span class="lines">@@ -485,6 +485,11 @@
</span><span class="cx"> return resource;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void CachedResourceLoader::documentDidFinishLoadEvent()
+{
+ m_validatedURLs.clear();
+}
+
</ins><span class="cx"> CachedResourceHandle<CachedResource> CachedResourceLoader::revalidateResource(const CachedResourceRequest& request, CachedResource* resource)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(resource);
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedResourceLoaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedResourceLoader.h (167742 => 167743)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedResourceLoader.h 2014-04-24 03:56:09 UTC (rev 167742)
+++ trunk/Source/WebCore/loader/cache/CachedResourceLoader.h 2014-04-24 04:11:50 UTC (rev 167743)
</span><span class="lines">@@ -133,6 +133,8 @@
</span><span class="cx">
</span><span class="cx"> static const ResourceLoaderOptions& defaultCachedResourceOptions();
</span><span class="cx">
</span><ins>+ void documentDidFinishLoadEvent();
+
</ins><span class="cx"> private:
</span><span class="cx"> explicit CachedResourceLoader(DocumentLoader*);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>