<!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>[165013] 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/165013">165013</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-03-03 15:07:50 -0800 (Mon, 03 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add support for sessions to MemoryCache.
https://bugs.webkit.org/show_bug.cgi?id=127794
Patch by Martin Hock <mhock@apple.com> on 2014-03-03
Reviewed by Sam Weinig.
Source/WebCore:
* WebCore.exp.in:
* editing/DeleteButtonController.cpp:
(WebCore::DeleteButtonController::createDeletionUI): Initialize CachedImage with sessionID.
* html/DOMURL.cpp:
(WebCore::DOMURL::revokeObjectURL): Remove URL from MemoryCache for all sessions.
* inspector/InspectorPageAgent.cpp:
(WebCore::InspectorPageAgent::cachedResource): Pass sessionID to MemoryCache.
* inspector/InspectorResourceAgent.cpp:
(WebCore::InspectorResourceAgent::replayXHR): Ditto.
* loader/DocumentLoader.cpp:
(WebCore::areAllLoadersPageCacheAcceptable): Ditto.
* loader/FrameLoader.cpp:
(WebCore::FrameLoader::tellClientAboutPastMemoryCacheLoads): Ditto.
* loader/ImageLoader.cpp:
(WebCore::ImageLoader::updateFromElement): Initialize CachedImage with sessionID.
* loader/archive/cf/LegacyWebArchive.cpp:
(WebCore::LegacyWebArchive::create): Pass sessionID to MemoryCache.
* loader/cache/CachedCSSStyleSheet.cpp:
(WebCore::CachedCSSStyleSheet::CachedCSSStyleSheet): Constructor takes sessionID.
* loader/cache/CachedCSSStyleSheet.h:
* loader/cache/CachedFont.cpp: Ditto.
(WebCore::CachedFont::CachedFont):
* loader/cache/CachedFont.h:
* loader/cache/CachedImage.cpp: Ditto.
(WebCore::CachedImage::CachedImage):
* loader/cache/CachedImage.h:
* loader/cache/CachedRawResource.cpp: Ditto.
(WebCore::CachedRawResource::CachedRawResource):
* loader/cache/CachedRawResource.h:
* loader/cache/CachedResource.cpp: Ditto.
(WebCore::CachedResource::CachedResource):
(WebCore::CachedResource::~CachedResource): Pass sessionID to MemoryCache.
* loader/cache/CachedResource.h:
(WebCore::CachedResource::sessionID):
* loader/cache/CachedResourceLoader.cpp:
(WebCore::createResource): Constructors take sessionID.
(WebCore::CachedResourceLoader::sessionID): Retrieve sessionID from page.
(WebCore::CachedResourceLoader::requestUserCSSStyleSheet): Pass sessionID to MemoryCache.
(WebCore::CachedResourceLoader::requestResource): Initialize CachedCSSStyleSheet with sessionID.
(WebCore::CachedResourceLoader::revalidateResource): Initialize cached resource with sessionID.
(WebCore::CachedResourceLoader::loadResource): Pass sessionID to MemoryCache and initialize cached resource with sessionID.
* loader/cache/CachedResourceLoader.h:
* loader/cache/CachedSVGDocument.cpp: Constructor takes sessionID.
(WebCore::CachedSVGDocument::CachedSVGDocument):
* loader/cache/CachedSVGDocument.h:
* loader/cache/CachedScript.cpp: Ditto.
(WebCore::CachedScript::CachedScript):
* loader/cache/CachedScript.h:
* loader/cache/CachedTextTrack.cpp: Ditto.
(WebCore::CachedTextTrack::CachedTextTrack):
* loader/cache/CachedTextTrack.h:
* loader/cache/CachedXSLStyleSheet.cpp: Ditto.
(WebCore::CachedXSLStyleSheet::CachedXSLStyleSheet):
* loader/cache/CachedXSLStyleSheet.h:
* loader/cache/MemoryCache.cpp:
(WebCore::MemoryCache::getSessionMap): Retrieve CachedResourceMap based on sessionID.
(WebCore::MemoryCache::add): Use sessionID from CachedResource parameter.
(WebCore::MemoryCache::revalidationSucceeded): Add sessionID parameter.
(WebCore::MemoryCache::resourceForURL): Ditto.
(WebCore::MemoryCache::resourceForRequest): Ditto, also move impl into impl method.
(WebCore::MemoryCache::resourceForRequestImpl): Add CachedResourceMap parameter.
(WebCore::MemoryCache::addImageToCache): Use default sessionID.
(WebCore::MemoryCache::removeImageFromCache): Ditto.
(WebCore::MemoryCache::evict): Use sessionID from CachedResource parameter.
(WebCore::MemoryCache::removeResourcesWithOrigin): Iterate through all CachedResourceMaps.
(WebCore::MemoryCache::getOriginsWithCache): Ditto.
(WebCore::MemoryCache::removeUrlFromCache): Add sessionID parameter.
(WebCore::MemoryCache::removeRequestFromCache): Ditto.
(WebCore::MemoryCache::removeRequestFromCacheImpl): Ditto.
(WebCore::MemoryCache::removeRequestFromSessionCaches): Iterate through all CachedResourceMaps.
(WebCore::MemoryCache::crossThreadRemoveRequestFromCache): Add sessionID parameter.
(WebCore::MemoryCache::getStatistics): Iterate through all CachedResourceMaps.
(WebCore::MemoryCache::setDisabled): Ditto.
* loader/cache/MemoryCache.h: Create another level for cache.
* platform/CrossThreadCopier.cpp: Allow copying SessionIDs across threads.
(WebCore::SessionID>::copy):
* platform/CrossThreadCopier.h:
* platform/network/cf/ResourceRequest.h:
(WebCore::ResourceRequest::ResourceRequest): Remove trailing whitespace.
* rendering/RenderSnapshottedPlugIn.cpp:
(WebCore::RenderSnapshottedPlugIn::updateSnapshot): Initialize CachedImage with sessionID.
* testing/Internals.cpp:
(WebCore::Internals::isLoadingFromMemoryCache): Pass sessionID to MemoryCache.
Source/WebKit:
* WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in:
Source/WebKit2:
* NetworkProcess/NetworkResourceLoader.h: Add sessionID() method.
(WebKit::NetworkResourceLoader::sessionID):
* NetworkProcess/mac/DiskCacheMonitor.h: Add sessionID member.
* NetworkProcess/mac/DiskCacheMonitor.mm:
(WebKit::DiskCacheMonitor::DiskCacheMonitor): Send sessionID to NetworkProcessConnection::DidCacheResource.
* WebProcess/Network/NetworkProcessConnection.cpp: Add sessionID parameter to didCacheResource and pass to MemoryCache.
(WebKit::NetworkProcessConnection::didCacheResource):
* WebProcess/Network/NetworkProcessConnection.h: Ditto.
* WebProcess/Network/NetworkProcessConnection.messages.in: Ditto.</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="#trunkSourceWebCoreeditingDeleteButtonControllercpp">trunk/Source/WebCore/editing/DeleteButtonController.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlDOMURLcpp">trunk/Source/WebCore/html/DOMURL.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorPageAgentcpp">trunk/Source/WebCore/inspector/InspectorPageAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorResourceAgentcpp">trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderDocumentLoadercpp">trunk/Source/WebCore/loader/DocumentLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderFrameLoadercpp">trunk/Source/WebCore/loader/FrameLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderImageLoadercpp">trunk/Source/WebCore/loader/ImageLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderarchivecfLegacyWebArchivecpp">trunk/Source/WebCore/loader/archive/cf/LegacyWebArchive.cpp</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedCSSStyleSheetcpp">trunk/Source/WebCore/loader/cache/CachedCSSStyleSheet.cpp</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedCSSStyleSheeth">trunk/Source/WebCore/loader/cache/CachedCSSStyleSheet.h</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedFontcpp">trunk/Source/WebCore/loader/cache/CachedFont.cpp</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedFonth">trunk/Source/WebCore/loader/cache/CachedFont.h</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedImagecpp">trunk/Source/WebCore/loader/cache/CachedImage.cpp</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedImageh">trunk/Source/WebCore/loader/cache/CachedImage.h</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedRawResourcecpp">trunk/Source/WebCore/loader/cache/CachedRawResource.cpp</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedRawResourceh">trunk/Source/WebCore/loader/cache/CachedRawResource.h</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedResourcecpp">trunk/Source/WebCore/loader/cache/CachedResource.cpp</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedResourceh">trunk/Source/WebCore/loader/cache/CachedResource.h</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>
<li><a href="#trunkSourceWebCoreloadercacheCachedSVGDocumentcpp">trunk/Source/WebCore/loader/cache/CachedSVGDocument.cpp</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedSVGDocumenth">trunk/Source/WebCore/loader/cache/CachedSVGDocument.h</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedScriptcpp">trunk/Source/WebCore/loader/cache/CachedScript.cpp</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedScripth">trunk/Source/WebCore/loader/cache/CachedScript.h</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedTextTrackcpp">trunk/Source/WebCore/loader/cache/CachedTextTrack.cpp</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedTextTrackh">trunk/Source/WebCore/loader/cache/CachedTextTrack.h</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedXSLStyleSheetcpp">trunk/Source/WebCore/loader/cache/CachedXSLStyleSheet.cpp</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedXSLStyleSheeth">trunk/Source/WebCore/loader/cache/CachedXSLStyleSheet.h</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>
<li><a href="#trunkSourceWebCoreplatformCrossThreadCopiercpp">trunk/Source/WebCore/platform/CrossThreadCopier.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformCrossThreadCopierh">trunk/Source/WebCore/platform/CrossThreadCopier.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcfResourceRequesth">trunk/Source/WebCore/platform/network/cf/ResourceRequest.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderSnapshottedPlugIncpp">trunk/Source/WebCore/rendering/RenderSnapshottedPlugIn.cpp</a></li>
<li><a href="#trunkSourceWebCoretestingInternalscpp">trunk/Source/WebCore/testing/Internals.cpp</a></li>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitWebKitvcxprojWebKitExportGeneratorWebKitExportsdefin">trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkResourceLoaderh">trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessmacDiskCacheMonitorh">trunk/Source/WebKit2/NetworkProcess/mac/DiskCacheMonitor.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessmacDiskCacheMonitormm">trunk/Source/WebKit2/NetworkProcess/mac/DiskCacheMonitor.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessNetworkNetworkProcessConnectioncpp">trunk/Source/WebKit2/WebProcess/Network/NetworkProcessConnection.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessNetworkNetworkProcessConnectionh">trunk/Source/WebKit2/WebProcess/Network/NetworkProcessConnection.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessNetworkNetworkProcessConnectionmessagesin">trunk/Source/WebKit2/WebProcess/Network/NetworkProcessConnection.messages.in</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (165012 => 165013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-03-03 23:04:55 UTC (rev 165012)
+++ trunk/Source/WebCore/ChangeLog 2014-03-03 23:07:50 UTC (rev 165013)
</span><span class="lines">@@ -1,3 +1,94 @@
</span><ins>+2014-03-03 Martin Hock <mhock@apple.com>
+
+ Add support for sessions to MemoryCache.
+ https://bugs.webkit.org/show_bug.cgi?id=127794
+
+ Reviewed by Sam Weinig.
+
+ * WebCore.exp.in:
+ * editing/DeleteButtonController.cpp:
+ (WebCore::DeleteButtonController::createDeletionUI): Initialize CachedImage with sessionID.
+ * html/DOMURL.cpp:
+ (WebCore::DOMURL::revokeObjectURL): Remove URL from MemoryCache for all sessions.
+ * inspector/InspectorPageAgent.cpp:
+ (WebCore::InspectorPageAgent::cachedResource): Pass sessionID to MemoryCache.
+ * inspector/InspectorResourceAgent.cpp:
+ (WebCore::InspectorResourceAgent::replayXHR): Ditto.
+ * loader/DocumentLoader.cpp:
+ (WebCore::areAllLoadersPageCacheAcceptable): Ditto.
+ * loader/FrameLoader.cpp:
+ (WebCore::FrameLoader::tellClientAboutPastMemoryCacheLoads): Ditto.
+ * loader/ImageLoader.cpp:
+ (WebCore::ImageLoader::updateFromElement): Initialize CachedImage with sessionID.
+ * loader/archive/cf/LegacyWebArchive.cpp:
+ (WebCore::LegacyWebArchive::create): Pass sessionID to MemoryCache.
+ * loader/cache/CachedCSSStyleSheet.cpp:
+ (WebCore::CachedCSSStyleSheet::CachedCSSStyleSheet): Constructor takes sessionID.
+ * loader/cache/CachedCSSStyleSheet.h:
+ * loader/cache/CachedFont.cpp: Ditto.
+ (WebCore::CachedFont::CachedFont):
+ * loader/cache/CachedFont.h:
+ * loader/cache/CachedImage.cpp: Ditto.
+ (WebCore::CachedImage::CachedImage):
+ * loader/cache/CachedImage.h:
+ * loader/cache/CachedRawResource.cpp: Ditto.
+ (WebCore::CachedRawResource::CachedRawResource):
+ * loader/cache/CachedRawResource.h:
+ * loader/cache/CachedResource.cpp: Ditto.
+ (WebCore::CachedResource::CachedResource):
+ (WebCore::CachedResource::~CachedResource): Pass sessionID to MemoryCache.
+ * loader/cache/CachedResource.h:
+ (WebCore::CachedResource::sessionID):
+ * loader/cache/CachedResourceLoader.cpp:
+ (WebCore::createResource): Constructors take sessionID.
+ (WebCore::CachedResourceLoader::sessionID): Retrieve sessionID from page.
+ (WebCore::CachedResourceLoader::requestUserCSSStyleSheet): Pass sessionID to MemoryCache.
+ (WebCore::CachedResourceLoader::requestResource): Initialize CachedCSSStyleSheet with sessionID.
+ (WebCore::CachedResourceLoader::revalidateResource): Initialize cached resource with sessionID.
+ (WebCore::CachedResourceLoader::loadResource): Pass sessionID to MemoryCache and initialize cached resource with sessionID.
+ * loader/cache/CachedResourceLoader.h:
+ * loader/cache/CachedSVGDocument.cpp: Constructor takes sessionID.
+ (WebCore::CachedSVGDocument::CachedSVGDocument):
+ * loader/cache/CachedSVGDocument.h:
+ * loader/cache/CachedScript.cpp: Ditto.
+ (WebCore::CachedScript::CachedScript):
+ * loader/cache/CachedScript.h:
+ * loader/cache/CachedTextTrack.cpp: Ditto.
+ (WebCore::CachedTextTrack::CachedTextTrack):
+ * loader/cache/CachedTextTrack.h:
+ * loader/cache/CachedXSLStyleSheet.cpp: Ditto.
+ (WebCore::CachedXSLStyleSheet::CachedXSLStyleSheet):
+ * loader/cache/CachedXSLStyleSheet.h:
+ * loader/cache/MemoryCache.cpp:
+ (WebCore::MemoryCache::getSessionMap): Retrieve CachedResourceMap based on sessionID.
+ (WebCore::MemoryCache::add): Use sessionID from CachedResource parameter.
+ (WebCore::MemoryCache::revalidationSucceeded): Add sessionID parameter.
+ (WebCore::MemoryCache::resourceForURL): Ditto.
+ (WebCore::MemoryCache::resourceForRequest): Ditto, also move impl into impl method.
+ (WebCore::MemoryCache::resourceForRequestImpl): Add CachedResourceMap parameter.
+ (WebCore::MemoryCache::addImageToCache): Use default sessionID.
+ (WebCore::MemoryCache::removeImageFromCache): Ditto.
+ (WebCore::MemoryCache::evict): Use sessionID from CachedResource parameter.
+ (WebCore::MemoryCache::removeResourcesWithOrigin): Iterate through all CachedResourceMaps.
+ (WebCore::MemoryCache::getOriginsWithCache): Ditto.
+ (WebCore::MemoryCache::removeUrlFromCache): Add sessionID parameter.
+ (WebCore::MemoryCache::removeRequestFromCache): Ditto.
+ (WebCore::MemoryCache::removeRequestFromCacheImpl): Ditto.
+ (WebCore::MemoryCache::removeRequestFromSessionCaches): Iterate through all CachedResourceMaps.
+ (WebCore::MemoryCache::crossThreadRemoveRequestFromCache): Add sessionID parameter.
+ (WebCore::MemoryCache::getStatistics): Iterate through all CachedResourceMaps.
+ (WebCore::MemoryCache::setDisabled): Ditto.
+ * loader/cache/MemoryCache.h: Create another level for cache.
+ * platform/CrossThreadCopier.cpp: Allow copying SessionIDs across threads.
+ (WebCore::SessionID>::copy):
+ * platform/CrossThreadCopier.h:
+ * platform/network/cf/ResourceRequest.h:
+ (WebCore::ResourceRequest::ResourceRequest): Remove trailing whitespace.
+ * rendering/RenderSnapshottedPlugIn.cpp:
+ (WebCore::RenderSnapshottedPlugIn::updateSnapshot): Initialize CachedImage with sessionID.
+ * testing/Internals.cpp:
+ (WebCore::Internals::isLoadingFromMemoryCache): Pass sessionID to MemoryCache.
+
</ins><span class="cx"> 2014-03-03 Andreas Kling <akling@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove unused DataView code from JSDOMBinding.h
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (165012 => 165013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.exp.in 2014-03-03 23:04:55 UTC (rev 165012)
+++ trunk/Source/WebCore/WebCore.exp.in 2014-03-03 23:07:50 UTC (rev 165013)
</span><span class="lines">@@ -169,8 +169,9 @@
</span><span class="cx"> __ZN7WebCore11MemoryCache13setCapacitiesEjjj
</span><span class="cx"> __ZN7WebCore11MemoryCache14evictResourcesEv
</span><span class="cx"> __ZN7WebCore11MemoryCache14resourceForURLERKNS_3URLE
</span><ins>+__ZN7WebCore11MemoryCache14resourceForURLERKNS_3URLENS_9SessionIDE
</ins><span class="cx"> __ZN7WebCore11MemoryCache15addImageToCacheEP7CGImageRKNS_3URLERKN3WTF6StringE
</span><del>-__ZN7WebCore11MemoryCache18resourceForRequestERKNS_15ResourceRequestE
</del><ins>+__ZN7WebCore11MemoryCache18resourceForRequestERKNS_15ResourceRequestENS_9SessionIDE
</ins><span class="cx"> __ZN7WebCore11MemoryCache19getOriginsWithCacheERN3WTF7HashSetINS1_6RefPtrINS_14SecurityOriginEEENS_18SecurityOriginHashENS1_10HashTraitsIS5_EEEE
</span><span class="cx"> __ZN7WebCore11MemoryCache20removeImageFromCacheERKNS_3URLERKN3WTF6StringE
</span><span class="cx"> __ZN7WebCore11MemoryCache25removeResourcesWithOriginEPNS_14SecurityOriginE
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingDeleteButtonControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/DeleteButtonController.cpp (165012 => 165013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/DeleteButtonController.cpp 2014-03-03 23:04:55 UTC (rev 165012)
+++ trunk/Source/WebCore/editing/DeleteButtonController.cpp 2014-03-03 23:07:50 UTC (rev 165013)
</span><span class="lines">@@ -254,7 +254,7 @@
</span><span class="cx"> if (buttonImage->isNull())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- button->setCachedImage(new CachedImage(buttonImage.get()));
</del><ins>+ button->setCachedImage(new CachedImage(buttonImage.get(), m_frame.page()->sessionID()));
</ins><span class="cx">
</span><span class="cx"> container->appendChild(button.get(), ec);
</span><span class="cx"> ASSERT(!ec);
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlDOMURLcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/DOMURL.cpp (165012 => 165013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/DOMURL.cpp 2014-03-03 23:04:55 UTC (rev 165012)
+++ trunk/Source/WebCore/html/DOMURL.cpp 2014-03-03 23:07:50 UTC (rev 165013)
</span><span class="lines">@@ -124,7 +124,7 @@
</span><span class="cx"> #if ENABLE(CACHE_PARTITIONING)
</span><span class="cx"> request.setCachePartition(scriptExecutionContext->topOrigin()->cachePartition());
</span><span class="cx"> #endif
</span><del>- MemoryCache::removeRequestFromCache(scriptExecutionContext, request);
</del><ins>+ MemoryCache::removeRequestFromSessionCaches(scriptExecutionContext, request);
</ins><span class="cx">
</span><span class="cx"> scriptExecutionContext->publicURLManager().revoke(url);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorPageAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorPageAgent.cpp (165012 => 165013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorPageAgent.cpp 2014-03-03 23:04:55 UTC (rev 165012)
+++ trunk/Source/WebCore/inspector/InspectorPageAgent.cpp 2014-03-03 23:07:50 UTC (rev 165013)
</span><span class="lines">@@ -282,7 +282,7 @@
</span><span class="cx"> #if ENABLE(CACHE_PARTITIONING)
</span><span class="cx"> request.setCachePartition(frame->document()->topOrigin()->cachePartition());
</span><span class="cx"> #endif
</span><del>- cachedResource = memoryCache()->resourceForRequest(request);
</del><ins>+ cachedResource = memoryCache()->resourceForRequest(request, frame->page()->sessionID());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return cachedResource;
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorResourceAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp (165012 => 165013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp 2014-03-03 23:04:55 UTC (rev 165012)
+++ trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp 2014-03-03 23:07:50 UTC (rev 165013)
</span><span class="lines">@@ -594,7 +594,7 @@
</span><span class="cx"> #if ENABLE(CACHE_PARTITIONING)
</span><span class="cx"> request.setCachePartition(m_pageAgent->mainFrame()->document()->topOrigin()->cachePartition());
</span><span class="cx"> #endif
</span><del>- CachedResource* cachedResource = memoryCache()->resourceForRequest(request);
</del><ins>+ CachedResource* cachedResource = memoryCache()->resourceForRequest(request, m_pageAgent->page()->sessionID());
</ins><span class="cx"> if (cachedResource)
</span><span class="cx"> memoryCache()->remove(cachedResource);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderDocumentLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/DocumentLoader.cpp (165012 => 165013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/DocumentLoader.cpp 2014-03-03 23:04:55 UTC (rev 165012)
+++ trunk/Source/WebCore/loader/DocumentLoader.cpp 2014-03-03 23:07:50 UTC (rev 165013)
</span><span class="lines">@@ -103,7 +103,10 @@
</span><span class="cx"> if (!handle)
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- CachedResource* cachedResource = memoryCache()->resourceForURL(handle->firstRequest().url());
</del><ins>+ if (!loader->frameLoader())
+ return false;
+
+ CachedResource* cachedResource = memoryCache()->resourceForURL(handle->firstRequest().url(), loader->frameLoader()->frame().page()->sessionID());
</ins><span class="cx"> if (!cachedResource)
</span><span class="cx"> return false;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderFrameLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/FrameLoader.cpp (165012 => 165013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/FrameLoader.cpp 2014-03-03 23:04:55 UTC (rev 165012)
+++ trunk/Source/WebCore/loader/FrameLoader.cpp 2014-03-03 23:07:50 UTC (rev 165013)
</span><span class="lines">@@ -3377,7 +3377,7 @@
</span><span class="cx">
</span><span class="cx"> size_t size = pastLoads.size();
</span><span class="cx"> for (size_t i = 0; i < size; ++i) {
</span><del>- CachedResource* resource = memoryCache()->resourceForRequest(pastLoads[i]);
</del><ins>+ CachedResource* resource = memoryCache()->resourceForRequest(pastLoads[i], m_frame.page()->sessionID());
</ins><span class="cx">
</span><span class="cx"> // FIXME: These loads, loaded from cache, but now gone from the cache by the time
</span><span class="cx"> // Page::setMemoryCacheClientCallsEnabled(true) is called, will not be seen by the client.
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderImageLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/ImageLoader.cpp (165012 => 165013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/ImageLoader.cpp 2014-03-03 23:04:55 UTC (rev 165012)
+++ trunk/Source/WebCore/loader/ImageLoader.cpp 2014-03-03 23:07:50 UTC (rev 165013)
</span><span class="lines">@@ -34,6 +34,7 @@
</span><span class="cx"> #include "HTMLNames.h"
</span><span class="cx"> #include "HTMLObjectElement.h"
</span><span class="cx"> #include "HTMLParserIdioms.h"
</span><ins>+#include "Page.h"
</ins><span class="cx"> #include "RenderImage.h"
</span><span class="cx"> #include "RenderSVGImage.h"
</span><span class="cx"> #include "SecurityOrigin.h"
</span><span class="lines">@@ -188,7 +189,7 @@
</span><span class="cx"> if (m_loadManually) {
</span><span class="cx"> bool autoLoadOtherImages = document.cachedResourceLoader()->autoLoadImages();
</span><span class="cx"> document.cachedResourceLoader()->setAutoLoadImages(false);
</span><del>- newImage = new CachedImage(request.resourceRequest());
</del><ins>+ newImage = new CachedImage(request.resourceRequest(), m_element.document().page()->sessionID());
</ins><span class="cx"> newImage->setLoading(true);
</span><span class="cx"> newImage->setOwningCachedResourceLoader(document.cachedResourceLoader());
</span><span class="cx"> document.cachedResourceLoader()->m_documentResources.set(newImage->url(), newImage.get());
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderarchivecfLegacyWebArchivecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/archive/cf/LegacyWebArchive.cpp (165012 => 165013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/archive/cf/LegacyWebArchive.cpp 2014-03-03 23:04:55 UTC (rev 165012)
+++ trunk/Source/WebCore/loader/archive/cf/LegacyWebArchive.cpp 2014-03-03 23:07:50 UTC (rev 165013)
</span><span class="lines">@@ -554,7 +554,7 @@
</span><span class="cx"> #if ENABLE(CACHE_PARTITIONING)
</span><span class="cx"> request.setCachePartition(frame->document()->topOrigin()->cachePartition());
</span><span class="cx"> #endif
</span><del>- CachedResource* cachedResource = memoryCache()->resourceForRequest(request);
</del><ins>+ CachedResource* cachedResource = memoryCache()->resourceForRequest(request, frame->page()->sessionID());
</ins><span class="cx"> if (cachedResource) {
</span><span class="cx"> ResourceBuffer* data = cachedResource->resourceBuffer();
</span><span class="cx"> resource = ArchiveResource::create(data ? data->sharedBuffer() : 0, subresourceURL, cachedResource->response());
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedCSSStyleSheetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedCSSStyleSheet.cpp (165012 => 165013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedCSSStyleSheet.cpp 2014-03-03 23:04:55 UTC (rev 165012)
+++ trunk/Source/WebCore/loader/cache/CachedCSSStyleSheet.cpp 2014-03-03 23:07:50 UTC (rev 165013)
</span><span class="lines">@@ -40,8 +40,8 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-CachedCSSStyleSheet::CachedCSSStyleSheet(const ResourceRequest& resourceRequest, const String& charset)
- : CachedResource(resourceRequest, CSSStyleSheet)
</del><ins>+CachedCSSStyleSheet::CachedCSSStyleSheet(const ResourceRequest& resourceRequest, const String& charset, SessionID sessionID)
+ : CachedResource(resourceRequest, CSSStyleSheet, sessionID)
</ins><span class="cx"> , m_decoder(TextResourceDecoder::create("text/css", charset))
</span><span class="cx"> {
</span><span class="cx"> // Prefer text/css but accept any type (dell.com serves a stylesheet
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedCSSStyleSheeth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedCSSStyleSheet.h (165012 => 165013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedCSSStyleSheet.h 2014-03-03 23:04:55 UTC (rev 165012)
+++ trunk/Source/WebCore/loader/cache/CachedCSSStyleSheet.h 2014-03-03 23:07:50 UTC (rev 165013)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx">
</span><span class="cx"> class CachedCSSStyleSheet final : public CachedResource {
</span><span class="cx"> public:
</span><del>- CachedCSSStyleSheet(const ResourceRequest&, const String& charset);
</del><ins>+ CachedCSSStyleSheet(const ResourceRequest&, const String& charset, SessionID);
</ins><span class="cx"> virtual ~CachedCSSStyleSheet();
</span><span class="cx">
</span><span class="cx"> const String sheetText(bool enforceMIMEType = true, bool* hasValidMIMEType = 0) const;
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedFontcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedFont.cpp (165012 => 165013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedFont.cpp 2014-03-03 23:04:55 UTC (rev 165012)
+++ trunk/Source/WebCore/loader/cache/CachedFont.cpp 2014-03-03 23:07:50 UTC (rev 165013)
</span><span class="lines">@@ -50,8 +50,8 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-CachedFont::CachedFont(const ResourceRequest& resourceRequest)
- : CachedResource(resourceRequest, FontResource)
</del><ins>+CachedFont::CachedFont(const ResourceRequest& resourceRequest, SessionID sessionID)
+ : CachedResource(resourceRequest, FontResource, sessionID)
</ins><span class="cx"> , m_loadInitiated(false)
</span><span class="cx"> , m_hasCreatedFontDataWrappingResource(false)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedFonth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedFont.h (165012 => 165013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedFont.h 2014-03-03 23:04:55 UTC (rev 165012)
+++ trunk/Source/WebCore/loader/cache/CachedFont.h 2014-03-03 23:07:50 UTC (rev 165013)
</span><span class="lines">@@ -42,7 +42,7 @@
</span><span class="cx">
</span><span class="cx"> class CachedFont final : public CachedResource {
</span><span class="cx"> public:
</span><del>- CachedFont(const ResourceRequest&);
</del><ins>+ CachedFont(const ResourceRequest&, SessionID);
</ins><span class="cx"> virtual ~CachedFont();
</span><span class="cx">
</span><span class="cx"> void beginLoadIfNeeded(CachedResourceLoader* dl);
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedImagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedImage.cpp (165012 => 165013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedImage.cpp 2014-03-03 23:04:55 UTC (rev 165012)
+++ trunk/Source/WebCore/loader/cache/CachedImage.cpp 2014-03-03 23:07:50 UTC (rev 165013)
</span><span class="lines">@@ -60,8 +60,8 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-CachedImage::CachedImage(const ResourceRequest& resourceRequest)
- : CachedResource(resourceRequest, ImageResource)
</del><ins>+CachedImage::CachedImage(const ResourceRequest& resourceRequest, SessionID sessionID)
+ : CachedResource(resourceRequest, ImageResource, sessionID)
</ins><span class="cx"> , m_image(0)
</span><span class="cx"> , m_isManuallyCached(false)
</span><span class="cx"> , m_shouldPaintBrokenImage(true)
</span><span class="lines">@@ -69,8 +69,8 @@
</span><span class="cx"> setStatus(Unknown);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-CachedImage::CachedImage(Image* image)
- : CachedResource(ResourceRequest(), ImageResource)
</del><ins>+CachedImage::CachedImage(Image* image, SessionID sessionID)
+ : CachedResource(ResourceRequest(), ImageResource, sessionID)
</ins><span class="cx"> , m_image(image)
</span><span class="cx"> , m_isManuallyCached(false)
</span><span class="cx"> , m_shouldPaintBrokenImage(true)
</span><span class="lines">@@ -79,9 +79,19 @@
</span><span class="cx"> setLoading(false);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-CachedImage::CachedImage(const URL& url, Image* image, CachedImage::CacheBehaviorType type)
- : CachedResource(ResourceRequest(url), ImageResource)
</del><ins>+CachedImage::CachedImage(const URL& url, Image* image, SessionID sessionID)
+ : CachedResource(ResourceRequest(url), ImageResource, sessionID)
</ins><span class="cx"> , m_image(image)
</span><ins>+ , m_isManuallyCached(false)
+ , m_shouldPaintBrokenImage(true)
+{
+ setStatus(Cached);
+ setLoading(false);
+}
+
+CachedImage::CachedImage(const URL& url, Image* image, CachedImage::CacheBehaviorType type, SessionID sessionID)
+ : CachedResource(ResourceRequest(url), ImageResource, sessionID)
+ , m_image(image)
</ins><span class="cx"> , m_isManuallyCached(type == CachedImage::ManuallyCached)
</span><span class="cx"> , m_shouldPaintBrokenImage(true)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedImageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedImage.h (165012 => 165013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedImage.h 2014-03-03 23:04:55 UTC (rev 165012)
+++ trunk/Source/WebCore/loader/cache/CachedImage.h 2014-03-03 23:07:50 UTC (rev 165013)
</span><span class="lines">@@ -50,9 +50,10 @@
</span><span class="cx"> public:
</span><span class="cx"> enum CacheBehaviorType { AutomaticallyCached, ManuallyCached };
</span><span class="cx">
</span><del>- CachedImage(const ResourceRequest&);
- CachedImage(Image*);
- CachedImage(const URL&, Image*, CacheBehaviorType = AutomaticallyCached);
</del><ins>+ CachedImage(const ResourceRequest&, SessionID);
+ CachedImage(Image*, SessionID);
+ CachedImage(const URL&, Image*, SessionID);
+ CachedImage(const URL&, Image*, CacheBehaviorType, SessionID);
</ins><span class="cx"> virtual ~CachedImage();
</span><span class="cx">
</span><span class="cx"> Image* image(); // Returns the nullImage() if the image is not available yet.
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedRawResourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedRawResource.cpp (165012 => 165013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedRawResource.cpp 2014-03-03 23:04:55 UTC (rev 165012)
+++ trunk/Source/WebCore/loader/cache/CachedRawResource.cpp 2014-03-03 23:07:50 UTC (rev 165013)
</span><span class="lines">@@ -35,8 +35,8 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-CachedRawResource::CachedRawResource(ResourceRequest& resourceRequest, Type type)
- : CachedResource(resourceRequest, type)
</del><ins>+CachedRawResource::CachedRawResource(ResourceRequest& resourceRequest, Type type, SessionID sessionID)
+ : CachedResource(resourceRequest, type, sessionID)
</ins><span class="cx"> , m_identifier(0)
</span><span class="cx"> {
</span><span class="cx"> // FIXME: The wrong CachedResource::Type here may cause a bad cast elsewhere.
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedRawResourceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedRawResource.h (165012 => 165013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedRawResource.h 2014-03-03 23:04:55 UTC (rev 165012)
+++ trunk/Source/WebCore/loader/cache/CachedRawResource.h 2014-03-03 23:07:50 UTC (rev 165013)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx">
</span><span class="cx"> class CachedRawResource final : public CachedResource {
</span><span class="cx"> public:
</span><del>- CachedRawResource(ResourceRequest&, Type);
</del><ins>+ CachedRawResource(ResourceRequest&, Type, SessionID);
</ins><span class="cx">
</span><span class="cx"> // FIXME: AssociatedURLLoader shouldn't be a DocumentThreadableLoader and therefore shouldn't
</span><span class="cx"> // use CachedRawResource. However, it is, and it needs to be able to defer loading.
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedResourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedResource.cpp (165012 => 165013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedResource.cpp 2014-03-03 23:04:55 UTC (rev 165012)
+++ trunk/Source/WebCore/loader/cache/CachedResource.cpp 2014-03-03 23:07:50 UTC (rev 165013)
</span><span class="lines">@@ -147,8 +147,9 @@
</span><span class="cx">
</span><span class="cx"> DEFINE_DEBUG_ONLY_GLOBAL(RefCountedLeakCounter, cachedResourceLeakCounter, ("CachedResource"));
</span><span class="cx">
</span><del>-CachedResource::CachedResource(const ResourceRequest& request, Type type)
</del><ins>+CachedResource::CachedResource(const ResourceRequest& request, Type type, SessionID sessionID)
</ins><span class="cx"> : m_resourceRequest(request)
</span><ins>+ , m_sessionID(sessionID)
</ins><span class="cx"> , m_loadPriority(defaultPriorityForResourceType(type))
</span><span class="cx"> , m_responseTimestamp(currentTime())
</span><span class="cx"> , m_decodedDataDeletionTimer(this, &CachedResource::decodedDataDeletionTimerFired, deadDecodedDataDeletionIntervalForResourceType(type))
</span><span class="lines">@@ -180,6 +181,7 @@
</span><span class="cx"> , m_proxyResource(0)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_type == unsigned(type)); // m_type is a bitfield, so this tests careless updates of the enum.
</span><ins>+ ASSERT(sessionID.isValid());
</ins><span class="cx"> #ifndef NDEBUG
</span><span class="cx"> cachedResourceLeakCounter.increment();
</span><span class="cx"> #endif
</span><span class="lines">@@ -199,7 +201,7 @@
</span><span class="cx"> ASSERT(canDelete());
</span><span class="cx"> ASSERT(!inCache());
</span><span class="cx"> ASSERT(!m_deleted);
</span><del>- ASSERT(url().isNull() || memoryCache()->resourceForRequest(resourceRequest()) != this);
</del><ins>+ ASSERT(url().isNull() || memoryCache()->resourceForRequest(resourceRequest(), sessionID()) != this);
</ins><span class="cx">
</span><span class="cx"> #ifndef NDEBUG
</span><span class="cx"> m_deleted = true;
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedResourceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedResource.h (165012 => 165013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedResource.h 2014-03-03 23:04:55 UTC (rev 165012)
+++ trunk/Source/WebCore/loader/cache/CachedResource.h 2014-03-03 23:07:50 UTC (rev 165013)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> #include "ResourceLoaderOptions.h"
</span><span class="cx"> #include "ResourceRequest.h"
</span><span class="cx"> #include "ResourceResponse.h"
</span><ins>+#include "SessionID.h"
</ins><span class="cx"> #include "Timer.h"
</span><span class="cx"> #include <time.h>
</span><span class="cx"> #include <wtf/HashCountedSet.h>
</span><span class="lines">@@ -89,7 +90,7 @@
</span><span class="cx"> DecodeError
</span><span class="cx"> };
</span><span class="cx">
</span><del>- CachedResource(const ResourceRequest&, Type);
</del><ins>+ CachedResource(const ResourceRequest&, Type, SessionID);
</ins><span class="cx"> virtual ~CachedResource();
</span><span class="cx">
</span><span class="cx"> virtual void load(CachedResourceLoader*, const ResourceLoaderOptions&);
</span><span class="lines">@@ -111,6 +112,7 @@
</span><span class="cx"> #if ENABLE(CACHE_PARTITIONING)
</span><span class="cx"> const String& cachePartition() const { return m_resourceRequest.cachePartition(); }
</span><span class="cx"> #endif
</span><ins>+ SessionID sessionID() const { return m_sessionID; }
</ins><span class="cx"> Type type() const { return static_cast<Type>(m_type); }
</span><span class="cx">
</span><span class="cx"> ResourceLoadPriority loadPriority() const { return m_loadPriority; }
</span><span class="lines">@@ -290,6 +292,7 @@
</span><span class="cx"> HashMap<CachedResourceClient*, OwnPtr<CachedResourceCallback>> m_clientsAwaitingCallback;
</span><span class="cx">
</span><span class="cx"> ResourceRequest m_resourceRequest;
</span><ins>+ SessionID m_sessionID;
</ins><span class="cx"> String m_accept;
</span><span class="cx"> RefPtr<SubresourceLoader> m_loader;
</span><span class="cx"> ResourceLoaderOptions m_options;
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedResourceLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp (165012 => 165013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp 2014-03-03 23:04:55 UTC (rev 165012)
+++ trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp 2014-03-03 23:07:50 UTC (rev 165013)
</span><span class="lines">@@ -48,12 +48,14 @@
</span><span class="cx"> #include "LoaderStrategy.h"
</span><span class="cx"> #include "Logging.h"
</span><span class="cx"> #include "MemoryCache.h"
</span><ins>+#include "Page.h"
</ins><span class="cx"> #include "PingLoader.h"
</span><span class="cx"> #include "PlatformStrategies.h"
</span><span class="cx"> #include "RenderElement.h"
</span><span class="cx"> #include "ResourceLoadScheduler.h"
</span><span class="cx"> #include "ScriptController.h"
</span><span class="cx"> #include "SecurityOrigin.h"
</span><ins>+#include "SessionID.h"
</ins><span class="cx"> #include "Settings.h"
</span><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="lines">@@ -70,35 +72,35 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-static CachedResource* createResource(CachedResource::Type type, ResourceRequest& request, const String& charset)
</del><ins>+static CachedResource* createResource(CachedResource::Type type, ResourceRequest& request, const String& charset, SessionID sessionID)
</ins><span class="cx"> {
</span><span class="cx"> switch (type) {
</span><span class="cx"> case CachedResource::ImageResource:
</span><del>- return new CachedImage(request);
</del><ins>+ return new CachedImage(request, sessionID);
</ins><span class="cx"> case CachedResource::CSSStyleSheet:
</span><del>- return new CachedCSSStyleSheet(request, charset);
</del><ins>+ return new CachedCSSStyleSheet(request, charset, sessionID);
</ins><span class="cx"> case CachedResource::Script:
</span><del>- return new CachedScript(request, charset);
</del><ins>+ return new CachedScript(request, charset, sessionID);
</ins><span class="cx"> case CachedResource::SVGDocumentResource:
</span><del>- return new CachedSVGDocument(request);
</del><ins>+ return new CachedSVGDocument(request, sessionID);
</ins><span class="cx"> case CachedResource::FontResource:
</span><del>- return new CachedFont(request);
</del><ins>+ return new CachedFont(request, sessionID);
</ins><span class="cx"> case CachedResource::RawResource:
</span><span class="cx"> case CachedResource::MainResource:
</span><del>- return new CachedRawResource(request, type);
</del><ins>+ return new CachedRawResource(request, type, sessionID);
</ins><span class="cx"> #if ENABLE(XSLT)
</span><span class="cx"> case CachedResource::XSLStyleSheet:
</span><del>- return new CachedXSLStyleSheet(request);
</del><ins>+ return new CachedXSLStyleSheet(request, sessionID);
</ins><span class="cx"> #endif
</span><span class="cx"> #if ENABLE(LINK_PREFETCH)
</span><span class="cx"> case CachedResource::LinkPrefetch:
</span><del>- return new CachedResource(request, CachedResource::LinkPrefetch);
</del><ins>+ return new CachedResource(request, CachedResource::LinkPrefetch, sessionID);
</ins><span class="cx"> case CachedResource::LinkSubresource:
</span><del>- return new CachedResource(request, CachedResource::LinkSubresource);
</del><ins>+ return new CachedResource(request, CachedResource::LinkSubresource, sessionID);
</ins><span class="cx"> #endif
</span><span class="cx"> #if ENABLE(VIDEO_TRACK)
</span><span class="cx"> case CachedResource::TextTrackResource:
</span><del>- return new CachedTextTrack(request);
</del><ins>+ return new CachedTextTrack(request, sessionID);
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="lines">@@ -147,6 +149,16 @@
</span><span class="cx"> return m_documentLoader ? m_documentLoader->frame() : 0;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+SessionID CachedResourceLoader::sessionID() const
+{
+ SessionID sessionID = SessionID::defaultSessionID();
+
+ if (Frame* f = frame())
+ sessionID = f->page()->sessionID();
+
+ return sessionID;
+}
+
</ins><span class="cx"> CachedResourceHandle<CachedImage> CachedResourceLoader::requestImage(CachedResourceRequest& request)
</span><span class="cx"> {
</span><span class="cx"> if (Frame* frame = this->frame()) {
</span><span class="lines">@@ -187,7 +199,7 @@
</span><span class="cx"> request.mutableResourceRequest().setCachePartition(document()->topOrigin()->cachePartition());
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- if (CachedResource* existing = memoryCache()->resourceForRequest(request.resourceRequest())) {
</del><ins>+ if (CachedResource* existing = memoryCache()->resourceForRequest(request.resourceRequest(), sessionID())) {
</ins><span class="cx"> if (existing->type() == CachedResource::CSSStyleSheet)
</span><span class="cx"> return toCachedCSSStyleSheet(existing);
</span><span class="cx"> memoryCache()->remove(existing);
</span><span class="lines">@@ -195,7 +207,7 @@
</span><span class="cx"> if (url.string() != request.resourceRequest().url())
</span><span class="cx"> request.mutableResourceRequest().setURL(url);
</span><span class="cx">
</span><del>- CachedResourceHandle<CachedCSSStyleSheet> userSheet = new CachedCSSStyleSheet(request.resourceRequest(), request.charset());
</del><ins>+ CachedResourceHandle<CachedCSSStyleSheet> userSheet = new CachedCSSStyleSheet(request.resourceRequest(), request.charset(), sessionID());
</ins><span class="cx">
</span><span class="cx"> memoryCache()->add(userSheet.get());
</span><span class="cx"> // FIXME: loadResource calls setOwningCachedResourceLoader() if the resource couldn't be added to cache. Does this function need to call it, too?
</span><span class="lines">@@ -428,7 +440,7 @@
</span><span class="cx"> request.mutableResourceRequest().setCachePartition(document()->topOrigin()->cachePartition());
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- resource = memoryCache()->resourceForRequest(request.resourceRequest());
</del><ins>+ resource = memoryCache()->resourceForRequest(request.resourceRequest(), sessionID());
</ins><span class="cx">
</span><span class="cx"> const RevalidationPolicy policy = determineRevalidationPolicy(type, request.mutableResourceRequest(), request.forPreload(), resource.get(), request.defer());
</span><span class="cx"> switch (policy) {
</span><span class="lines">@@ -480,10 +492,11 @@
</span><span class="cx"> ASSERT(!memoryCache()->disabled());
</span><span class="cx"> ASSERT(resource->canUseCacheValidator());
</span><span class="cx"> ASSERT(!resource->resourceToRevalidate());
</span><del>-
</del><ins>+ ASSERT(resource->sessionID() == sessionID());
+
</ins><span class="cx"> // Copy the URL out of the resource to be revalidated in case it gets deleted by the remove() call below.
</span><span class="cx"> String url = resource->url();
</span><del>- CachedResourceHandle<CachedResource> newResource = createResource(resource->type(), resource->resourceRequest(), resource->encoding());
</del><ins>+ CachedResourceHandle<CachedResource> newResource = createResource(resource->type(), resource->resourceRequest(), resource->encoding(), resource->sessionID());
</ins><span class="cx">
</span><span class="cx"> LOG(ResourceLoading, "Resource %p created to revalidate %p", newResource.get(), resource);
</span><span class="cx"> newResource->setResourceToRevalidate(resource);
</span><span class="lines">@@ -500,11 +513,11 @@
</span><span class="cx">
</span><span class="cx"> CachedResourceHandle<CachedResource> CachedResourceLoader::loadResource(CachedResource::Type type, CachedResourceRequest& request, const String& charset)
</span><span class="cx"> {
</span><del>- ASSERT(!memoryCache()->resourceForRequest(request.resourceRequest()));
</del><ins>+ ASSERT(!memoryCache()->resourceForRequest(request.resourceRequest(), sessionID()));
</ins><span class="cx">
</span><span class="cx"> LOG(ResourceLoading, "Loading CachedResource for '%s'.", request.resourceRequest().url().stringCenterEllipsizedToLength().latin1().data());
</span><span class="cx">
</span><del>- CachedResourceHandle<CachedResource> resource = createResource(type, request.mutableResourceRequest(), charset);
</del><ins>+ CachedResourceHandle<CachedResource> resource = createResource(type, request.mutableResourceRequest(), charset, sessionID());
</ins><span class="cx">
</span><span class="cx"> if (!memoryCache()->add(resource.get()))
</span><span class="cx"> resource->setOwningCachedResourceLoader(this);
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedResourceLoaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedResourceLoader.h (165012 => 165013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedResourceLoader.h 2014-03-03 23:04:55 UTC (rev 165012)
+++ trunk/Source/WebCore/loader/cache/CachedResourceLoader.h 2014-03-03 23:07:50 UTC (rev 165013)
</span><span class="lines">@@ -111,6 +111,7 @@
</span><span class="cx"> Document* document() const { return m_document; } // Can be null
</span><span class="cx"> void setDocument(Document* document) { m_document = document; }
</span><span class="cx"> void clearDocumentLoader() { m_documentLoader = 0; }
</span><ins>+ SessionID sessionID() const;
</ins><span class="cx">
</span><span class="cx"> void removeCachedResource(CachedResource*) const;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedSVGDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedSVGDocument.cpp (165012 => 165013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedSVGDocument.cpp 2014-03-03 23:04:55 UTC (rev 165012)
+++ trunk/Source/WebCore/loader/cache/CachedSVGDocument.cpp 2014-03-03 23:07:50 UTC (rev 165013)
</span><span class="lines">@@ -30,8 +30,8 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-CachedSVGDocument::CachedSVGDocument(const ResourceRequest& request)
- : CachedResource(request, SVGDocumentResource)
</del><ins>+CachedSVGDocument::CachedSVGDocument(const ResourceRequest& request, SessionID sessionID)
+ : CachedResource(request, SVGDocumentResource, sessionID)
</ins><span class="cx"> , m_decoder(TextResourceDecoder::create("application/xml"))
</span><span class="cx"> {
</span><span class="cx"> setAccept("image/svg+xml");
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedSVGDocumenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedSVGDocument.h (165012 => 165013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedSVGDocument.h 2014-03-03 23:04:55 UTC (rev 165012)
+++ trunk/Source/WebCore/loader/cache/CachedSVGDocument.h 2014-03-03 23:07:50 UTC (rev 165013)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx">
</span><span class="cx"> class CachedSVGDocument final : public CachedResource {
</span><span class="cx"> public:
</span><del>- explicit CachedSVGDocument(const ResourceRequest&);
</del><ins>+ explicit CachedSVGDocument(const ResourceRequest&, SessionID);
</ins><span class="cx"> virtual ~CachedSVGDocument();
</span><span class="cx">
</span><span class="cx"> SVGDocument* document() const { return m_document.get(); }
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedScriptcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedScript.cpp (165012 => 165013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedScript.cpp 2014-03-03 23:04:55 UTC (rev 165012)
+++ trunk/Source/WebCore/loader/cache/CachedScript.cpp 2014-03-03 23:07:50 UTC (rev 165013)
</span><span class="lines">@@ -39,8 +39,8 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-CachedScript::CachedScript(const ResourceRequest& resourceRequest, const String& charset)
- : CachedResource(resourceRequest, Script)
</del><ins>+CachedScript::CachedScript(const ResourceRequest& resourceRequest, const String& charset, SessionID sessionID)
+ : CachedResource(resourceRequest, Script, sessionID)
</ins><span class="cx"> , m_decoder(TextResourceDecoder::create(ASCIILiteral("application/javascript"), charset))
</span><span class="cx"> {
</span><span class="cx"> // It's javascript we want.
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedScripth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedScript.h (165012 => 165013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedScript.h 2014-03-03 23:04:55 UTC (rev 165012)
+++ trunk/Source/WebCore/loader/cache/CachedScript.h 2014-03-03 23:07:50 UTC (rev 165013)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx">
</span><span class="cx"> class CachedScript final : public CachedResource {
</span><span class="cx"> public:
</span><del>- CachedScript(const ResourceRequest&, const String& charset);
</del><ins>+ CachedScript(const ResourceRequest&, const String& charset, SessionID);
</ins><span class="cx"> virtual ~CachedScript();
</span><span class="cx">
</span><span class="cx"> const String& script();
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedTextTrackcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedTextTrack.cpp (165012 => 165013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedTextTrack.cpp 2014-03-03 23:04:55 UTC (rev 165012)
+++ trunk/Source/WebCore/loader/cache/CachedTextTrack.cpp 2014-03-03 23:07:50 UTC (rev 165013)
</span><span class="lines">@@ -39,8 +39,8 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-CachedTextTrack::CachedTextTrack(const ResourceRequest& resourceRequest)
- : CachedResource(resourceRequest, TextTrackResource)
</del><ins>+CachedTextTrack::CachedTextTrack(const ResourceRequest& resourceRequest, SessionID sessionID)
+ : CachedResource(resourceRequest, TextTrackResource, sessionID)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedTextTrackh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedTextTrack.h (165012 => 165013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedTextTrack.h 2014-03-03 23:04:55 UTC (rev 165012)
+++ trunk/Source/WebCore/loader/cache/CachedTextTrack.h 2014-03-03 23:07:50 UTC (rev 165013)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx">
</span><span class="cx"> class CachedTextTrack final : public CachedResource {
</span><span class="cx"> public:
</span><del>- CachedTextTrack(const ResourceRequest&);
</del><ins>+ CachedTextTrack(const ResourceRequest&, SessionID);
</ins><span class="cx"> virtual ~CachedTextTrack();
</span><span class="cx">
</span><span class="cx"> private:
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedXSLStyleSheetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedXSLStyleSheet.cpp (165012 => 165013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedXSLStyleSheet.cpp 2014-03-03 23:04:55 UTC (rev 165012)
+++ trunk/Source/WebCore/loader/cache/CachedXSLStyleSheet.cpp 2014-03-03 23:07:50 UTC (rev 165013)
</span><span class="lines">@@ -37,8 +37,8 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(XSLT)
</span><span class="cx">
</span><del>-CachedXSLStyleSheet::CachedXSLStyleSheet(const ResourceRequest& resourceRequest)
- : CachedResource(resourceRequest, XSLStyleSheet)
</del><ins>+CachedXSLStyleSheet::CachedXSLStyleSheet(const ResourceRequest& resourceRequest, SessionID sessionID)
+ : CachedResource(resourceRequest, XSLStyleSheet, sessionID)
</ins><span class="cx"> , m_decoder(TextResourceDecoder::create("text/xsl"))
</span><span class="cx"> {
</span><span class="cx"> // It's XML we want.
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedXSLStyleSheeth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedXSLStyleSheet.h (165012 => 165013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedXSLStyleSheet.h 2014-03-03 23:04:55 UTC (rev 165012)
+++ trunk/Source/WebCore/loader/cache/CachedXSLStyleSheet.h 2014-03-03 23:07:50 UTC (rev 165013)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx"> #if ENABLE(XSLT)
</span><span class="cx"> class CachedXSLStyleSheet final : public CachedResource {
</span><span class="cx"> public:
</span><del>- CachedXSLStyleSheet(const ResourceRequest&);
</del><ins>+ CachedXSLStyleSheet(const ResourceRequest&, SessionID);
</ins><span class="cx">
</span><span class="cx"> const String& sheet() const { return m_sheet; }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheMemoryCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/MemoryCache.cpp (165012 => 165013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/MemoryCache.cpp 2014-03-03 23:04:55 UTC (rev 165012)
+++ trunk/Source/WebCore/loader/cache/MemoryCache.cpp 2014-03-03 23:07:50 UTC (rev 165013)
</span><span class="lines">@@ -80,6 +80,17 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+MemoryCache::CachedResourceMap& MemoryCache::getSessionMap(SessionID sessionID)
+{
+ ASSERT(sessionID.isValid());
+ CachedResourceMap* map = m_sessionResources.get(sessionID);
+ if (!map) {
+ m_sessionResources.set(sessionID, std::make_unique<CachedResourceMap>());
+ map = m_sessionResources.get(sessionID);
+ }
+ return *map;
+}
+
</ins><span class="cx"> URL MemoryCache::removeFragmentIdentifierIfNeeded(const URL& originalURL)
</span><span class="cx"> {
</span><span class="cx"> if (!originalURL.hasFragmentIdentifier())
</span><span class="lines">@@ -101,15 +112,16 @@
</span><span class="cx">
</span><span class="cx"> ASSERT(WTF::isMainThread());
</span><span class="cx">
</span><ins>+ CachedResourceMap& resources = getSessionMap(resource->sessionID());
</ins><span class="cx"> #if ENABLE(CACHE_PARTITIONING)
</span><del>- CachedResourceItem* originMap = m_resources.get(resource->url());
</del><ins>+ CachedResourceItem* originMap = resources.get(resource->url());
</ins><span class="cx"> if (!originMap) {
</span><span class="cx"> originMap = new CachedResourceItem;
</span><del>- m_resources.set(resource->url(), adoptPtr(originMap));
</del><ins>+ resources.set(resource->url(), adoptPtr(originMap));
</ins><span class="cx"> }
</span><span class="cx"> originMap->set(resource->cachePartition(), resource);
</span><span class="cx"> #else
</span><del>- m_resources.set(resource->url(), resource);
</del><ins>+ resources.set(resource->url(), resource);
</ins><span class="cx"> #endif
</span><span class="cx"> resource->setInCache(true);
</span><span class="cx">
</span><span class="lines">@@ -134,17 +146,18 @@
</span><span class="cx">
</span><span class="cx"> evict(revalidatingResource);
</span><span class="cx">
</span><ins>+ CachedResourceMap& resources = getSessionMap(resource->sessionID());
</ins><span class="cx"> #if ENABLE(CACHE_PARTITIONING)
</span><del>- ASSERT(!m_resources.get(resource->url()) || !m_resources.get(resource->url())->get(resource->cachePartition()));
- CachedResourceItem* originMap = m_resources.get(resource->url());
</del><ins>+ ASSERT(!resources.get(resource->url()) || !resources.get(resource->url())->get(resource->cachePartition()));
+ CachedResourceItem* originMap = resources.get(resource->url());
</ins><span class="cx"> if (!originMap) {
</span><span class="cx"> originMap = new CachedResourceItem;
</span><del>- m_resources.set(resource->url(), adoptPtr(originMap));
</del><ins>+ resources.set(resource->url(), adoptPtr(originMap));
</ins><span class="cx"> }
</span><span class="cx"> originMap->set(resource->cachePartition(), resource);
</span><span class="cx"> #else
</span><del>- ASSERT(!m_resources.get(resource->url()));
- m_resources.set(resource->url(), resource);
</del><ins>+ ASSERT(!resources.get(resource->url()));
+ resources.set(resource->url(), resource);
</ins><span class="cx"> #endif
</span><span class="cx"> resource->setInCache(true);
</span><span class="cx"> resource->updateResponseAfterRevalidation(response);
</span><span class="lines">@@ -171,20 +184,31 @@
</span><span class="cx">
</span><span class="cx"> CachedResource* MemoryCache::resourceForURL(const URL& resourceURL)
</span><span class="cx"> {
</span><del>- return resourceForRequest(ResourceRequest(resourceURL));
</del><ins>+ return resourceForURL(resourceURL, SessionID::defaultSessionID());
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-CachedResource* MemoryCache::resourceForRequest(const ResourceRequest& request)
</del><ins>+CachedResource* MemoryCache::resourceForURL(const URL& resourceURL, SessionID sessionID)
</ins><span class="cx"> {
</span><ins>+ return resourceForRequest(ResourceRequest(resourceURL), sessionID);
+}
+
+CachedResource* MemoryCache::resourceForRequest(const ResourceRequest& request, SessionID sessionID)
+{
+ return resourceForRequestImpl(request, getSessionMap(sessionID));
+}
+
+CachedResource* MemoryCache::resourceForRequestImpl(const ResourceRequest& request, CachedResourceMap& resources)
+{
</ins><span class="cx"> ASSERT(WTF::isMainThread());
</span><span class="cx"> URL url = removeFragmentIdentifierIfNeeded(request.url());
</span><ins>+
</ins><span class="cx"> #if ENABLE(CACHE_PARTITIONING)
</span><del>- CachedResourceItem* item = m_resources.get(url);
</del><ins>+ CachedResourceItem* item = resources.get(url);
</ins><span class="cx"> CachedResource* resource = 0;
</span><span class="cx"> if (item)
</span><span class="cx"> resource = item->get(request.cachePartition());
</span><span class="cx"> #else
</span><del>- CachedResource* resource = m_resources.get(url);
</del><ins>+ CachedResource* resource = resources.get(url);
</ins><span class="cx"> #endif
</span><span class="cx"> bool wasPurgeable = MemoryCache::shouldMakeResourcePurgeableOnEviction() && resource && resource->isPurgeable();
</span><span class="cx"> if (resource && !resource->makePurgeable(false)) {
</span><span class="lines">@@ -225,13 +249,14 @@
</span><span class="cx"> bool MemoryCache::addImageToCache(NativeImagePtr image, const URL& url, const String& cachePartition)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(image);
</span><ins>+ SessionID sessionID = SessionID::defaultSessionID();
</ins><span class="cx"> removeImageFromCache(url, cachePartition); // Remove cache entry if it already exists.
</span><span class="cx">
</span><span class="cx"> RefPtr<BitmapImage> bitmapImage = BitmapImage::create(image, nullptr);
</span><span class="cx"> if (!bitmapImage)
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- std::unique_ptr<CachedImage> cachedImage = std::make_unique<CachedImage>(url, bitmapImage.get(), CachedImage::ManuallyCached);
</del><ins>+ std::unique_ptr<CachedImage> cachedImage = std::make_unique<CachedImage>(url, bitmapImage.get(), CachedImage::ManuallyCached, sessionID);
</ins><span class="cx">
</span><span class="cx"> // Actual release of the CGImageRef is done in BitmapImage.
</span><span class="cx"> CFRetain(image);
</span><span class="lines">@@ -240,21 +265,21 @@
</span><span class="cx"> #if ENABLE(CACHE_PARTITIONING)
</span><span class="cx"> cachedImage->resourceRequest().setCachePartition(cachePartition);
</span><span class="cx"> #endif
</span><del>- add(cachedImage.release());
</del><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void MemoryCache::removeImageFromCache(const URL& url, const String& cachePartition)
</span><span class="cx"> {
</span><ins>+ CachedResourceMap& resources = getSessionMap(SessionID::defaultSessionID());
</ins><span class="cx"> #if ENABLE(CACHE_PARTITIONING)
</span><span class="cx"> CachedResource* resource;
</span><del>- if (CachedResourceItem* item = m_resources.get(url))
</del><ins>+ if (CachedResourceItem* item = resources.get(url))
</ins><span class="cx"> resource = item->get(ResourceRequest::partitionName(cachePartition));
</span><span class="cx"> else
</span><span class="cx"> resource = nullptr;
</span><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(cachePartition);
</span><del>- CachedResource* resource = m_resources.get(url);
</del><ins>+ CachedResource* resource = resources.get(url);
</ins><span class="cx"> #endif
</span><span class="cx"> if (!resource)
</span><span class="cx"> return;
</span><span class="lines">@@ -522,17 +547,18 @@
</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><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><del>- CachedResourceItem* item = m_resources.get(resource->url());
</del><ins>+ CachedResourceItem* item = resources.get(resource->url());
</ins><span class="cx"> if (item) {
</span><span class="cx"> item->remove(resource->cachePartition());
</span><span class="cx"> if (!item->size())
</span><del>- m_resources.remove(resource->url());
</del><ins>+ resources.remove(resource->url());
</ins><span class="cx"> }
</span><span class="cx"> #else
</span><del>- m_resources.remove(resource->url());
</del><ins>+ resources.remove(resource->url());
</ins><span class="cx"> #endif
</span><span class="cx"> resource->setInCache(false);
</span><span class="cx">
</span><span class="lines">@@ -547,9 +573,9 @@
</span><span class="cx"> adjustSize(resource->hasClients(), -static_cast<int>(resource->size()));
</span><span class="cx"> } else
</span><span class="cx"> #if ENABLE(CACHE_PARTITIONING)
</span><del>- ASSERT(!m_resources.get(resource->url()) || m_resources.get(resource->url())->get(resource->cachePartition()) != resource);
</del><ins>+ ASSERT(!resources.get(resource->url()) || resources.get(resource->url())->get(resource->cachePartition()) != resource);
</ins><span class="cx"> #else
</span><del>- ASSERT(m_resources.get(resource->url()) != resource);
</del><ins>+ ASSERT(resources.get(resource->url()) != resource);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> resource->deleteIfPossible();
</span><span class="lines">@@ -669,31 +695,33 @@
</span><span class="cx"> {
</span><span class="cx"> Vector<CachedResource*> resourcesWithOrigin;
</span><span class="cx">
</span><del>- CachedResourceMap::iterator e = m_resources.end();
</del><ins>+ for (auto& resources : m_sessionResources) {
+ CachedResourceMap::iterator e = resources.value->end();
</ins><span class="cx"> #if ENABLE(CACHE_PARTITIONING)
</span><del>- String originPartition = ResourceRequest::partitionName(origin->host());
</del><ins>+ String originPartition = ResourceRequest::partitionName(origin->host());
</ins><span class="cx"> #endif
</span><span class="cx">
</span><del>- for (CachedResourceMap::iterator it = m_resources.begin(); it != e; ++it) {
</del><ins>+ for (CachedResourceMap::iterator it = resources.value->begin(); it != e; ++it) {
</ins><span class="cx"> #if ENABLE(CACHE_PARTITIONING)
</span><del>- for (CachedResourceItem::iterator itemIterator = it->value->begin(); itemIterator != it->value->end(); ++itemIterator) {
- CachedResource* resource = itemIterator->value;
- String partition = itemIterator->key;
- if (partition == originPartition) {
- resourcesWithOrigin.append(resource);
- continue;
- }
</del><ins>+ for (CachedResourceItem::iterator itemIterator = it->value->begin(); itemIterator != it->value->end(); ++itemIterator) {
+ CachedResource* resource = itemIterator->value;
+ String partition = itemIterator->key;
+ if (partition == originPartition) {
+ resourcesWithOrigin.append(resource);
+ continue;
+ }
</ins><span class="cx"> #else
</span><del>- CachedResource* resource = it->value;
</del><ins>+ CachedResource* resource = it->value;
</ins><span class="cx"> #endif
</span><del>- RefPtr<SecurityOrigin> resourceOrigin = SecurityOrigin::createFromString(resource->url());
- if (!resourceOrigin)
- continue;
- if (resourceOrigin->equal(origin))
- resourcesWithOrigin.append(resource);
</del><ins>+ RefPtr<SecurityOrigin> resourceOrigin = SecurityOrigin::createFromString(resource->url());
+ if (!resourceOrigin)
+ continue;
+ if (resourceOrigin->equal(origin))
+ resourcesWithOrigin.append(resource);
</ins><span class="cx"> #if ENABLE(CACHE_PARTITIONING)
</span><ins>+ }
+#endif
</ins><span class="cx"> }
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> for (size_t i = 0; i < resourcesWithOrigin.size(); ++i)
</span><span class="lines">@@ -705,16 +733,18 @@
</span><span class="cx"> #if ENABLE(CACHE_PARTITIONING)
</span><span class="cx"> DEFINE_STATIC_LOCAL(String, httpString, ("http"));
</span><span class="cx"> #endif
</span><del>- CachedResourceMap::iterator e = m_resources.end();
- for (CachedResourceMap::iterator it = m_resources.begin(); it != e; ++it) {
</del><ins>+ for (auto& resources : m_sessionResources) {
+ CachedResourceMap::iterator e = resources.value->end();
+ for (CachedResourceMap::iterator it = resources.value->begin(); it != e; ++it) {
</ins><span class="cx"> #if ENABLE(CACHE_PARTITIONING)
</span><del>- if (it->value->begin()->key == emptyString())
- origins.add(SecurityOrigin::createFromString(it->value->begin()->value->url()));
- else
- origins.add(SecurityOrigin::create(httpString, it->value->begin()->key, 0));
</del><ins>+ if (it->value->begin()->key == emptyString())
+ origins.add(SecurityOrigin::createFromString(it->value->begin()->value->url()));
+ else
+ origins.add(SecurityOrigin::create(httpString, it->value->begin()->key, 0));
</ins><span class="cx"> #else
</span><del>- origins.add(SecurityOrigin::createFromString(it->value->url()));
</del><ins>+ origins.add(SecurityOrigin::createFromString(it->value->url()));
</ins><span class="cx"> #endif
</span><ins>+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -808,31 +838,39 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MemoryCache::removeUrlFromCache(ScriptExecutionContext* context, const String& urlString)
</del><ins>+void MemoryCache::removeUrlFromCache(ScriptExecutionContext* context, const String& urlString, SessionID sessionID)
</ins><span class="cx"> {
</span><del>- removeRequestFromCache(context, ResourceRequest(urlString));
</del><ins>+ removeRequestFromCache(context, ResourceRequest(urlString), sessionID);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void MemoryCache::removeRequestFromCache(ScriptExecutionContext* context, const ResourceRequest& request)
</del><ins>+void MemoryCache::removeRequestFromCache(ScriptExecutionContext* context, const ResourceRequest& request, SessionID sessionID)
</ins><span class="cx"> {
</span><span class="cx"> if (context->isWorkerGlobalScope()) {
</span><del>- toWorkerGlobalScope(context)->thread().workerLoaderProxy().postTaskToLoader(createCallbackTask(&crossThreadRemoveRequestFromCache, request));
</del><ins>+ toWorkerGlobalScope(context)->thread().workerLoaderProxy().postTaskToLoader(createCallbackTask(&crossThreadRemoveRequestFromCache, request, sessionID));
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- removeRequestFromCacheImpl(context, request);
</del><ins>+ removeRequestFromCacheImpl(context, request, sessionID);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void MemoryCache::removeRequestFromCacheImpl(ScriptExecutionContext*, const ResourceRequest& request)
</del><ins>+void MemoryCache::removeRequestFromCacheImpl(ScriptExecutionContext*, const ResourceRequest& request, SessionID sessionID)
</ins><span class="cx"> {
</span><del>- if (CachedResource* resource = memoryCache()->resourceForRequest(request))
</del><ins>+ if (CachedResource* resource = memoryCache()->resourceForRequest(request, sessionID))
</ins><span class="cx"> memoryCache()->remove(resource);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MemoryCache::crossThreadRemoveRequestFromCache(ScriptExecutionContext* context, PassOwnPtr<WebCore::CrossThreadResourceRequestData> requestData)
</del><ins>+void MemoryCache::removeRequestFromSessionCaches(ScriptExecutionContext*, const ResourceRequest& request)
</ins><span class="cx"> {
</span><ins>+ for (auto& resources : memoryCache()->m_sessionResources) {
+ if (CachedResource* resource = memoryCache()->resourceForRequestImpl(request, *resources.value))
+ memoryCache()->remove(resource);
+ }
+}
+
+void MemoryCache::crossThreadRemoveRequestFromCache(ScriptExecutionContext* context, PassOwnPtr<WebCore::CrossThreadResourceRequestData> requestData, SessionID sessionID)
+{
</ins><span class="cx"> OwnPtr<ResourceRequest> request(ResourceRequest::adopt(requestData));
</span><del>- MemoryCache::removeRequestFromCacheImpl(context, *request);
</del><ins>+ MemoryCache::removeRequestFromCacheImpl(context, *request, sessionID);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void MemoryCache::TypeStatistic::addResource(CachedResource* o)
</span><span class="lines">@@ -855,38 +893,41 @@
</span><span class="cx"> MemoryCache::Statistics MemoryCache::getStatistics()
</span><span class="cx"> {
</span><span class="cx"> Statistics stats;
</span><del>- CachedResourceMap::iterator e = m_resources.end();
- for (CachedResourceMap::iterator i = m_resources.begin(); i != e; ++i) {
</del><ins>+
+ for (auto &resources : m_sessionResources) {
+ CachedResourceMap::iterator e = resources.value->end();
+ for (CachedResourceMap::iterator i = resources.value->begin(); i != e; ++i) {
</ins><span class="cx"> #if ENABLE(CACHE_PARTITIONING)
</span><del>- for (CachedResourceItem::iterator itemIterator = i->value->begin(); itemIterator != i->value->end(); ++itemIterator) {
- CachedResource* resource = itemIterator->value;
</del><ins>+ for (CachedResourceItem::iterator itemIterator = i->value->begin(); itemIterator != i->value->end(); ++itemIterator) {
+ CachedResource* resource = itemIterator->value;
</ins><span class="cx"> #else
</span><del>- CachedResource* resource = i->value;
</del><ins>+ CachedResource* resource = i->value;
</ins><span class="cx"> #endif
</span><del>- switch (resource->type()) {
- case CachedResource::ImageResource:
- stats.images.addResource(resource);
- break;
- case CachedResource::CSSStyleSheet:
- stats.cssStyleSheets.addResource(resource);
- break;
- case CachedResource::Script:
- stats.scripts.addResource(resource);
- break;
</del><ins>+ switch (resource->type()) {
+ case CachedResource::ImageResource:
+ stats.images.addResource(resource);
+ break;
+ case CachedResource::CSSStyleSheet:
+ stats.cssStyleSheets.addResource(resource);
+ break;
+ case CachedResource::Script:
+ stats.scripts.addResource(resource);
+ break;
</ins><span class="cx"> #if ENABLE(XSLT)
</span><del>- case CachedResource::XSLStyleSheet:
- stats.xslStyleSheets.addResource(resource);
- break;
</del><ins>+ case CachedResource::XSLStyleSheet:
+ stats.xslStyleSheets.addResource(resource);
+ break;
</ins><span class="cx"> #endif
</span><del>- case CachedResource::FontResource:
- stats.fonts.addResource(resource);
- break;
- default:
- break;
</del><ins>+ case CachedResource::FontResource:
+ stats.fonts.addResource(resource);
+ break;
+ default:
+ break;
+ }
+#if ENABLE(CACHE_PARTITIONING)
</ins><span class="cx"> }
</span><del>-#if ENABLE(CACHE_PARTITIONING)
</del><ins>+#endif
</ins><span class="cx"> }
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx"> return stats;
</span><span class="cx"> }
</span><span class="lines">@@ -898,9 +939,12 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> for (;;) {
</span><del>- CachedResourceMap::iterator outerIterator = m_resources.begin();
- if (outerIterator == m_resources.end())
</del><ins>+ SessionCachedResourceMap::iterator sessionIterator = m_sessionResources.begin();
+ if (sessionIterator == m_sessionResources.end())
</ins><span class="cx"> break;
</span><ins>+ CachedResourceMap::iterator outerIterator = sessionIterator->value->begin();
+ if (outerIterator == sessionIterator->value->end())
+ break;
</ins><span class="cx"> #if ENABLE(CACHE_PARTITIONING)
</span><span class="cx"> CachedResourceItem::iterator innerIterator = outerIterator->value->begin();
</span><span class="cx"> evict(innerIterator->value);
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheMemoryCacheh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/MemoryCache.h (165012 => 165013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/MemoryCache.h 2014-03-03 23:04:55 UTC (rev 165012)
+++ trunk/Source/WebCore/loader/cache/MemoryCache.h 2014-03-03 23:07:50 UTC (rev 165013)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx">
</span><span class="cx"> #include "NativeImagePtr.h"
</span><span class="cx"> #include "SecurityOriginHash.h"
</span><ins>+#include "SessionIDHash.h"
</ins><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx"> #include <wtf/HashSet.h>
</span><span class="cx"> #include <wtf/Noncopyable.h>
</span><span class="lines">@@ -87,6 +88,7 @@
</span><span class="cx"> #else
</span><span class="cx"> typedef HashMap<String, CachedResource*> CachedResourceMap;
</span><span class="cx"> #endif
</span><ins>+ typedef HashMap<SessionID, std::unique_ptr<CachedResourceMap>> SessionCachedResourceMap;
</ins><span class="cx">
</span><span class="cx"> struct LRUList {
</span><span class="cx"> CachedResource* m_head;
</span><span class="lines">@@ -119,9 +121,10 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> CachedResource* resourceForURL(const URL&);
</span><del>- CachedResource* resourceForRequest(const ResourceRequest&);
-
- bool add(CachedResource* resource);
</del><ins>+ CachedResource* resourceForURL(const URL&, SessionID);
+ CachedResource* resourceForRequest(const ResourceRequest&, SessionID);
+
+ bool add(CachedResource*);
</ins><span class="cx"> void remove(CachedResource* resource) { evict(resource); }
</span><span class="cx">
</span><span class="cx"> static URL removeFragmentIdentifierIfNeeded(const URL& originalURL);
</span><span class="lines">@@ -170,8 +173,9 @@
</span><span class="cx"> void flushCachedImagesToDisk(); // Flush encoded data from resources still referenced by web pages.
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- static void removeUrlFromCache(ScriptExecutionContext*, const String& urlString);
- static void removeRequestFromCache(ScriptExecutionContext*, const ResourceRequest&);
</del><ins>+ static void removeUrlFromCache(ScriptExecutionContext*, const String& urlString, SessionID);
+ static void removeRequestFromCache(ScriptExecutionContext*, const ResourceRequest&, SessionID);
+ static void removeRequestFromSessionCaches(ScriptExecutionContext*, const ResourceRequest&);
</ins><span class="cx">
</span><span class="cx"> // Function to collect cache statistics for the caches window in the Safari Debug menu.
</span><span class="cx"> Statistics getStatistics();
</span><span class="lines">@@ -221,9 +225,12 @@
</span><span class="cx"> bool makeResourcePurgeable(CachedResource*);
</span><span class="cx"> void evict(CachedResource*);
</span><span class="cx">
</span><del>- static void removeRequestFromCacheImpl(ScriptExecutionContext*, const ResourceRequest&);
- static void crossThreadRemoveRequestFromCache(ScriptExecutionContext*, PassOwnPtr<CrossThreadResourceRequestData>);
</del><ins>+ CachedResource* resourceForRequestImpl(const ResourceRequest&, CachedResourceMap&);
+ static void removeRequestFromCacheImpl(ScriptExecutionContext*, const ResourceRequest&, SessionID);
+ static void crossThreadRemoveRequestFromCache(ScriptExecutionContext*, PassOwnPtr<CrossThreadResourceRequestData>, SessionID);
</ins><span class="cx">
</span><ins>+ CachedResourceMap& getSessionMap(SessionID);
+
</ins><span class="cx"> bool m_disabled; // Whether or not the cache is enabled.
</span><span class="cx"> bool m_pruneEnabled;
</span><span class="cx"> bool m_inPruneResources;
</span><span class="lines">@@ -246,7 +253,7 @@
</span><span class="cx">
</span><span class="cx"> // A URL-based map of all resources that are in the cache (including the freshest version of objects that are currently being
</span><span class="cx"> // referenced by a Web page).
</span><del>- CachedResourceMap m_resources;
</del><ins>+ SessionCachedResourceMap m_sessionResources;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> inline bool MemoryCache::shouldMakeResourcePurgeableOnEviction()
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformCrossThreadCopiercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/CrossThreadCopier.cpp (165012 => 165013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/CrossThreadCopier.cpp 2014-03-03 23:04:55 UTC (rev 165012)
+++ trunk/Source/WebCore/platform/CrossThreadCopier.cpp 2014-03-03 23:07:50 UTC (rev 165013)
</span><span class="lines">@@ -37,6 +37,7 @@
</span><span class="cx"> #include "ResourceRequest.h"
</span><span class="cx"> #include "ResourceResponse.h"
</span><span class="cx"> #include "SerializedScriptValue.h"
</span><ins>+#include "SessionID.h"
</ins><span class="cx"> #include <wtf/Assertions.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="lines">@@ -74,6 +75,11 @@
</span><span class="cx"> return response.copyData();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+CrossThreadCopierBase<false, false, SessionID>::Type CrossThreadCopierBase<false, false, SessionID>::copy(const SessionID& sessionID)
+{
+ return sessionID;
+}
+
</ins><span class="cx"> #if ENABLE(INDEXED_DATABASE)
</span><span class="cx">
</span><span class="cx"> IndexedDB::TransactionMode CrossThreadCopierBase<false, false, IndexedDB::TransactionMode>::copy(const IndexedDB::TransactionMode& mode)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformCrossThreadCopierh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/CrossThreadCopier.h (165012 => 165013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/CrossThreadCopier.h 2014-03-03 23:04:55 UTC (rev 165012)
+++ trunk/Source/WebCore/platform/CrossThreadCopier.h 2014-03-03 23:07:50 UTC (rev 165013)
</span><span class="lines">@@ -46,6 +46,7 @@
</span><span class="cx"> class ResourceError;
</span><span class="cx"> class ResourceRequest;
</span><span class="cx"> class ResourceResponse;
</span><ins>+ class SessionID;
</ins><span class="cx"> struct CrossThreadResourceResponseData;
</span><span class="cx"> struct CrossThreadResourceRequestData;
</span><span class="cx"> struct ThreadableLoaderOptions;
</span><span class="lines">@@ -145,6 +146,11 @@
</span><span class="cx"> static Type copy(const ResourceResponse&);
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+ template<> struct CrossThreadCopierBase<false, false, SessionID> {
+ typedef SessionID Type;
+ static Type copy(const SessionID&);
+ };
+
</ins><span class="cx"> #if ENABLE(INDEXED_DATABASE)
</span><span class="cx"> namespace IndexedDB {
</span><span class="cx"> enum class TransactionMode;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcfResourceRequesth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/cf/ResourceRequest.h (165012 => 165013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/cf/ResourceRequest.h 2014-03-03 23:04:55 UTC (rev 165012)
+++ trunk/Source/WebCore/platform/network/cf/ResourceRequest.h 2014-03-03 23:07:50 UTC (rev 165013)
</span><span class="lines">@@ -57,7 +57,7 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>- ResourceRequest(const URL& url, const String& referrer, ResourceRequestCachePolicy policy = UseProtocolCachePolicy)
</del><ins>+ ResourceRequest(const URL& url, const String& referrer, ResourceRequestCachePolicy policy = UseProtocolCachePolicy)
</ins><span class="cx"> : ResourceRequestBase(url, policy)
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> , m_mainResourceRequest(false)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderSnapshottedPlugIncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderSnapshottedPlugIn.cpp (165012 => 165013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderSnapshottedPlugIn.cpp 2014-03-03 23:04:55 UTC (rev 165012)
+++ trunk/Source/WebCore/rendering/RenderSnapshottedPlugIn.cpp 2014-03-03 23:07:50 UTC (rev 165013)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> #include "ChromeClient.h"
</span><span class="cx"> #include "Cursor.h"
</span><span class="cx"> #include "Filter.h"
</span><ins>+#include "Frame.h"
</ins><span class="cx"> #include "FrameLoaderClient.h"
</span><span class="cx"> #include "FrameView.h"
</span><span class="cx"> #include "Gradient.h"
</span><span class="lines">@@ -85,7 +86,7 @@
</span><span class="cx"> if (!image)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- m_snapshotResource->setCachedImage(new CachedImage(image.get()));
</del><ins>+ m_snapshotResource->setCachedImage(new CachedImage(image.get(), view().frameView().frame().page()->sessionID()));
</ins><span class="cx"> repaint();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.cpp (165012 => 165013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.cpp 2014-03-03 23:04:55 UTC (rev 165012)
+++ trunk/Source/WebCore/testing/Internals.cpp 2014-03-03 23:07:50 UTC (rev 165013)
</span><span class="lines">@@ -356,9 +356,9 @@
</span><span class="cx">
</span><span class="cx"> bool Internals::isLoadingFromMemoryCache(const String& url)
</span><span class="cx"> {
</span><del>- if (!contextDocument())
</del><ins>+ if (!contextDocument() || !contextDocument()->page())
</ins><span class="cx"> return false;
</span><del>- CachedResource* resource = memoryCache()->resourceForURL(contextDocument()->completeURL(url));
</del><ins>+ CachedResource* resource = memoryCache()->resourceForURL(contextDocument()->completeURL(url), contextDocument()->page()->sessionID());
</ins><span class="cx"> return resource && resource->status() == CachedResource::Cached;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (165012 => 165013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog 2014-03-03 23:04:55 UTC (rev 165012)
+++ trunk/Source/WebKit/ChangeLog 2014-03-03 23:07:50 UTC (rev 165013)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2014-03-03 Martin Hock <mhock@apple.com>
+
+ Add support for sessions to MemoryCache.
+ https://bugs.webkit.org/show_bug.cgi?id=127794
+
+ Reviewed by Sam Weinig.
+
+ * WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in:
+
</ins><span class="cx"> 2014-03-02 Andreas Kling <akling@apple.com>
</span><span class="cx">
</span><span class="cx"> Blind Windows build fix.
</span></span></pre></div>
<a id="trunkSourceWebKitWebKitvcxprojWebKitExportGeneratorWebKitExportsdefin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in (165012 => 165013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in 2014-03-03 23:04:55 UTC (rev 165012)
+++ trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in 2014-03-03 23:07:50 UTC (rev 165013)
</span><span class="lines">@@ -477,3 +477,5 @@
</span><span class="cx"> symbolWithPointer(??1DOMWindow@WebCore@@UAE@XZ, ??1DOMWindow@WebCore@@UEAA@XZ)
</span><span class="cx"> symbolWithPointer(?visibleContentRect@ScrollableArea@WebCore@@QBE?AVIntRect@2@W4VisibleContentRectBehavior@12@@Z, ?visibleContentRect@ScrollableArea@WebCore@@QEBA?AVIntRect@2@W4VisibleContentRectBehavior@12@@Z)
</span><span class="cx"> symbolWithPointer(?disableAccessibility@AXObjectCache@WebCore@@SAXXZ, ?disableAccessibility@AXObjectCache@WebCore@@SAXXZ)
</span><ins>+ symbolWithPointer(?sessionID@Page@WebCore@@QBE?AVSessionID@2@XZ, ?sessionID@Page@WebCore@@QEBA?AVSessionID@2@XZ)
+ symbolWithPointer(?resourceForURL@MemoryCache@WebCore@@QAEPAVCachedResource@2@ABVURL@2@VSessionID@2@@Z, ?resourceForURL@MemoryCache@WebCore@@QEAAPAVCachedResource@2@ABVURL@2@VSessionID@2@@Z)
</ins></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (165012 => 165013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-03-03 23:04:55 UTC (rev 165012)
+++ trunk/Source/WebKit2/ChangeLog 2014-03-03 23:07:50 UTC (rev 165013)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2014-03-03 Martin Hock <mhock@apple.com>
+
+ Add support for sessions to MemoryCache.
+ https://bugs.webkit.org/show_bug.cgi?id=127794
+
+ Reviewed by Sam Weinig.
+
+ * NetworkProcess/NetworkResourceLoader.h: Add sessionID() method.
+ (WebKit::NetworkResourceLoader::sessionID):
+ * NetworkProcess/mac/DiskCacheMonitor.h: Add sessionID member.
+ * NetworkProcess/mac/DiskCacheMonitor.mm:
+ (WebKit::DiskCacheMonitor::DiskCacheMonitor): Send sessionID to NetworkProcessConnection::DidCacheResource.
+ * WebProcess/Network/NetworkProcessConnection.cpp: Add sessionID parameter to didCacheResource and pass to MemoryCache.
+ (WebKit::NetworkProcessConnection::didCacheResource):
+ * WebProcess/Network/NetworkProcessConnection.h: Ditto.
+ * WebProcess/Network/NetworkProcessConnection.messages.in: Ditto.
+
</ins><span class="cx"> 2014-03-03 Benjamin Poulain <bpoulain@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS][WK2] Regression: ScrollView's scroll offset is never set after r164702
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkResourceLoaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h (165012 => 165013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h 2014-03-03 23:04:55 UTC (rev 165012)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h 2014-03-03 23:07:50 UTC (rev 165013)
</span><span class="lines">@@ -72,6 +72,7 @@
</span><span class="cx">
</span><span class="cx"> WebCore::ResourceLoadPriority priority() { return m_priority; }
</span><span class="cx"> WebCore::ResourceRequest& request() { return m_request; }
</span><ins>+ WebCore::SessionID sessionID() const { return m_sessionID; }
</ins><span class="cx">
</span><span class="cx"> WebCore::ResourceHandle* handle() const { return m_handle.get(); }
</span><span class="cx"> void didConvertHandleToDownload();
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessmacDiskCacheMonitorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/mac/DiskCacheMonitor.h (165012 => 165013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/mac/DiskCacheMonitor.h 2014-03-03 23:04:55 UTC (rev 165012)
+++ trunk/Source/WebKit2/NetworkProcess/mac/DiskCacheMonitor.h 2014-03-03 23:07:50 UTC (rev 165013)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #include "MessageSender.h"
</span><span class="cx"> #include <WebCore/ResourceRequest.h>
</span><ins>+#include <WebCore/SessionID.h>
</ins><span class="cx"> #include <wtf/RunLoop.h>
</span><span class="cx">
</span><span class="cx"> typedef const struct _CFCachedURLResponse* CFCachedURLResponseRef;
</span><span class="lines">@@ -52,6 +53,7 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<NetworkConnectionToWebProcess> m_connectionToWebProcess;
</span><span class="cx"> WebCore::ResourceRequest m_resourceRequest;
</span><ins>+ WebCore::SessionID m_sessionID;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessmacDiskCacheMonitormm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/mac/DiskCacheMonitor.mm (165012 => 165013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/mac/DiskCacheMonitor.mm 2014-03-03 23:04:55 UTC (rev 165012)
+++ trunk/Source/WebKit2/NetworkProcess/mac/DiskCacheMonitor.mm 2014-03-03 23:07:50 UTC (rev 165013)
</span><span class="lines">@@ -62,6 +62,7 @@
</span><span class="cx"> DiskCacheMonitor::DiskCacheMonitor(CFCachedURLResponseRef cachedResponse, NetworkResourceLoader* loader)
</span><span class="cx"> : m_connectionToWebProcess(loader->connectionToWebProcess())
</span><span class="cx"> , m_resourceRequest(loader->request())
</span><ins>+ , m_sessionID(loader->sessionID())
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(RunLoop::isMain());
</span><span class="cx">
</span><span class="lines">@@ -88,7 +89,7 @@
</span><span class="cx"> if (handle.isNull())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- monitor->send(Messages::NetworkProcessConnection::DidCacheResource(monitor->resourceRequest(), handle));
</del><ins>+ monitor->send(Messages::NetworkProcessConnection::DidCacheResource(monitor->resourceRequest(), handle, m_sessionID));
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> _CFCachedURLResponseSetBecameFileBackedCallBackBlock(cachedResponse, block, dispatch_get_main_queue());
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessNetworkNetworkProcessConnectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Network/NetworkProcessConnection.cpp (165012 => 165013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Network/NetworkProcessConnection.cpp 2014-03-03 23:04:55 UTC (rev 165012)
+++ trunk/Source/WebKit2/WebProcess/Network/NetworkProcessConnection.cpp 2014-03-03 23:07:50 UTC (rev 165013)
</span><span class="lines">@@ -36,6 +36,7 @@
</span><span class="cx"> #include <WebCore/CachedResource.h>
</span><span class="cx"> #include <WebCore/MemoryCache.h>
</span><span class="cx"> #include <WebCore/ResourceBuffer.h>
</span><ins>+#include <WebCore/SessionID.h>
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(NETWORK_PROCESS)
</span><span class="cx">
</span><span class="lines">@@ -81,9 +82,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(SHAREABLE_RESOURCE)
</span><del>-void NetworkProcessConnection::didCacheResource(const ResourceRequest& request, const ShareableResource::Handle& handle)
</del><ins>+void NetworkProcessConnection::didCacheResource(const ResourceRequest& request, const ShareableResource::Handle& handle, SessionID sessionID)
</ins><span class="cx"> {
</span><del>- CachedResource* resource = memoryCache()->resourceForRequest(request);
</del><ins>+ CachedResource* resource = memoryCache()->resourceForRequest(request, sessionID);
</ins><span class="cx"> if (!resource)
</span><span class="cx"> return;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessNetworkNetworkProcessConnectionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Network/NetworkProcessConnection.h (165012 => 165013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Network/NetworkProcessConnection.h 2014-03-03 23:04:55 UTC (rev 165012)
+++ trunk/Source/WebKit2/WebProcess/Network/NetworkProcessConnection.h 2014-03-03 23:07:50 UTC (rev 165013)
</span><span class="lines">@@ -41,6 +41,7 @@
</span><span class="cx"> class ResourceError;
</span><span class="cx"> class ResourceRequest;
</span><span class="cx"> class ResourceResponse;
</span><ins>+class SessionID;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="lines">@@ -70,7 +71,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(SHAREABLE_RESOURCE)
</span><span class="cx"> // Message handlers.
</span><del>- void didCacheResource(const WebCore::ResourceRequest&, const ShareableResource::Handle&);
</del><ins>+ void didCacheResource(const WebCore::ResourceRequest&, const ShareableResource::Handle&, WebCore::SessionID);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> // The connection from the web process to the network process.
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessNetworkNetworkProcessConnectionmessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Network/NetworkProcessConnection.messages.in (165012 => 165013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Network/NetworkProcessConnection.messages.in 2014-03-03 23:04:55 UTC (rev 165012)
+++ trunk/Source/WebKit2/WebProcess/Network/NetworkProcessConnection.messages.in 2014-03-03 23:07:50 UTC (rev 165013)
</span><span class="lines">@@ -25,7 +25,7 @@
</span><span class="cx"> messages -> NetworkProcessConnection LegacyReceiver {
</span><span class="cx">
</span><span class="cx"> #if ENABLE(SHAREABLE_RESOURCE)
</span><del>- DidCacheResource(WebCore::ResourceRequest request, WebKit::ShareableResource::Handle resource)
</del><ins>+ DidCacheResource(WebCore::ResourceRequest request, WebKit::ShareableResource::Handle resource, WebCore::SessionID sessionID)
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>