<!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>[179410] 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/179410">179410</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2015-01-30 14:00:22 -0800 (Fri, 30 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/179403">r179403</a>.
https://bugs.webkit.org/show_bug.cgi?id=141091
Broke fast/files/workers/worker-apply-blob-url-to-xhr.html
(Requested by ap_ on #webkit).
Reverted changeset:
"Optimize MemoryCache::getSessionMap() a bit"
https://bugs.webkit.org/show_bug.cgi?id=141069
http://trac.webkit.org/changeset/179403
Patch by Commit Queue <commit-queue@webkit.org> on 2015-01-30</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreloadercacheMemoryCachecpp">trunk/Source/WebCore/loader/cache/MemoryCache.cpp</a></li>
<li><a href="#trunkSourceWebCoreloadercacheMemoryCacheh">trunk/Source/WebCore/loader/cache/MemoryCache.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (179409 => 179410)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-01-30 20:49:33 UTC (rev 179409)
+++ trunk/Source/WebCore/ChangeLog 2015-01-30 22:00:22 UTC (rev 179410)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-01-30 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r179403.
+ https://bugs.webkit.org/show_bug.cgi?id=141091
+
+ Broke fast/files/workers/worker-apply-blob-url-to-xhr.html
+ (Requested by ap_ on #webkit).
+
+ Reverted changeset:
+
+ "Optimize MemoryCache::getSessionMap() a bit"
+ https://bugs.webkit.org/show_bug.cgi?id=141069
+ http://trac.webkit.org/changeset/179403
+
</ins><span class="cx"> 2015-01-30 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Rename shared() static member functions to singleton() for singleton classes.
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheMemoryCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/MemoryCache.cpp (179409 => 179410)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/MemoryCache.cpp 2015-01-30 20:49:33 UTC (rev 179409)
+++ trunk/Source/WebCore/loader/cache/MemoryCache.cpp 2015-01-30 22:00:22 UTC (rev 179410)
</span><span class="lines">@@ -74,12 +74,14 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-MemoryCache::CachedResourceMap& MemoryCache::sessionResources(SessionID sessionID)
</del><ins>+MemoryCache::CachedResourceMap& MemoryCache::getSessionMap(SessionID sessionID)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(sessionID.isValid());
</span><del>- auto& map = m_sessionResources.add(sessionID, nullptr).iterator->value;
- if (!map)
- map = std::make_unique<CachedResourceMap>();
</del><ins>+ CachedResourceMap* map = m_sessionResources.get(sessionID);
+ if (!map) {
+ m_sessionResources.set(sessionID, std::make_unique<CachedResourceMap>());
+ map = m_sessionResources.get(sessionID);
+ }
</ins><span class="cx"> return *map;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -104,7 +106,7 @@
</span><span class="cx">
</span><span class="cx"> ASSERT(WTF::isMainThread());
</span><span class="cx">
</span><del>- CachedResourceMap& resources = sessionResources(resource->sessionID());
</del><ins>+ CachedResourceMap& resources = getSessionMap(resource->sessionID());
</ins><span class="cx"> #if ENABLE(CACHE_PARTITIONING)
</span><span class="cx"> CachedResourceItem* originMap = resources.get(resource->url());
</span><span class="cx"> if (!originMap) {
</span><span class="lines">@@ -138,7 +140,7 @@
</span><span class="cx">
</span><span class="cx"> remove(revalidatingResource);
</span><span class="cx">
</span><del>- CachedResourceMap& resources = sessionResources(resource->sessionID());
</del><ins>+ CachedResourceMap& resources = getSessionMap(resource->sessionID());
</ins><span class="cx"> #if ENABLE(CACHE_PARTITIONING)
</span><span class="cx"> ASSERT(!resources.get(resource->url()) || !resources.get(resource->url())->get(resource->cachePartition()));
</span><span class="cx"> CachedResourceItem* originMap = resources.get(resource->url());
</span><span class="lines">@@ -181,7 +183,7 @@
</span><span class="cx">
</span><span class="cx"> CachedResource* MemoryCache::resourceForRequest(const ResourceRequest& request, SessionID sessionID)
</span><span class="cx"> {
</span><del>- return resourceForRequestImpl(request, sessionResources(sessionID));
</del><ins>+ return resourceForRequestImpl(request, getSessionMap(sessionID));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> CachedResource* MemoryCache::resourceForRequestImpl(const ResourceRequest& request, CachedResourceMap& resources)
</span><span class="lines">@@ -248,7 +250,7 @@
</span><span class="cx">
</span><span class="cx"> void MemoryCache::removeImageFromCache(const URL& url, const String& domainForCachePartition)
</span><span class="cx"> {
</span><del>- CachedResourceMap& resources = sessionResources(SessionID::defaultSessionID());
</del><ins>+ CachedResourceMap& resources = getSessionMap(SessionID::defaultSessionID());
</ins><span class="cx"> #if ENABLE(CACHE_PARTITIONING)
</span><span class="cx"> CachedResource* resource;
</span><span class="cx"> if (CachedResourceItem* item = resources.get(url))
</span><span class="lines">@@ -415,7 +417,7 @@
</span><span class="cx"> LOG(ResourceLoading, "Evicting resource %p for '%s' from cache", resource, resource->url().string().latin1().data());
</span><span class="cx"> // The resource may have already been removed by someone other than our caller,
</span><span class="cx"> // who needed a fresh copy for a reload. See <http://bugs.webkit.org/show_bug.cgi?id=12479#c6>.
</span><del>- CachedResourceMap& resources = sessionResources(resource->sessionID());
</del><ins>+ CachedResourceMap& resources = getSessionMap(resource->sessionID());
</ins><span class="cx"> if (resource->inCache()) {
</span><span class="cx"> // Remove from the resource map.
</span><span class="cx"> #if ENABLE(CACHE_PARTITIONING)
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheMemoryCacheh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/MemoryCache.h (179409 => 179410)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/MemoryCache.h 2015-01-30 20:49:33 UTC (rev 179409)
+++ trunk/Source/WebCore/loader/cache/MemoryCache.h 2015-01-30 22:00:22 UTC (rev 179410)
</span><span class="lines">@@ -186,7 +186,7 @@
</span><span class="cx"> unsigned deadCapacity() const;
</span><span class="cx">
</span><span class="cx"> CachedResource* resourceForRequestImpl(const ResourceRequest&, CachedResourceMap&);
</span><del>- CachedResourceMap& sessionResources(SessionID);
</del><ins>+ CachedResourceMap& getSessionMap(SessionID);
</ins><span class="cx">
</span><span class="cx"> bool m_disabled; // Whether or not the cache is enabled.
</span><span class="cx"> bool m_inPruneResources;
</span></span></pre>
</div>
</div>
</body>
</html>