<!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>[211946] 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/211946">211946</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2017-02-09 03:09:28 -0800 (Thu, 09 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove most cases of #if ENABLE(CACHE_PARTITIONING)
https://bugs.webkit.org/show_bug.cgi?id=167990
Reviewed by Sam Weinig.
Source/WebCore:
We'll just return empty string for the partition if partitioning is not enabled.
* html/DOMURL.cpp:
(WebCore::DOMURL::revokeObjectURL):
* inspector/InspectorPageAgent.cpp:
(WebCore::InspectorPageAgent::cachedResource):
* loader/FrameLoader.cpp:
(WebCore::FrameLoader::loadURL):
* loader/archive/cf/LegacyWebArchive.cpp:
(WebCore::LegacyWebArchive::create):
* loader/cache/CachedResource.h:
(WebCore::CachedResource::url):
(WebCore::CachedResource::cachePartition):
* loader/cache/CachedResourceLoader.cpp:
(WebCore::CachedResourceLoader::requestUserCSSStyleSheet):
(WebCore::CachedResourceLoader::requestResource):
* loader/cache/CachedResourceRequest.cpp:
(WebCore::CachedResourceRequest::setDomainForCachePartition):
* loader/cache/CachedResourceRequest.h:
* loader/cache/MemoryCache.cpp:
(WebCore::MemoryCache::add):
(WebCore::MemoryCache::revalidationSucceeded):
(WebCore::MemoryCache::resourceForRequestImpl):
(WebCore::MemoryCache::addImageToCache):
(WebCore::MemoryCache::removeImageFromCache):
(WebCore::MemoryCache::remove):
(WebCore::MemoryCache::removeResourcesWithOrigin):
(WebCore::MemoryCache::removeResourcesWithOrigins):
(WebCore::MemoryCache::getOriginsWithCache):
(WebCore::MemoryCache::originsWithCache):
* loader/cache/MemoryCache.h:
* page/SecurityOrigin.cpp:
(WebCore::SecurityOrigin::domainForCachePartition):
* page/SecurityOrigin.h:
* platform/SchemeRegistry.cpp:
(WebCore::cachePartitioningSchemes):
(WebCore::SchemeRegistry::shouldPartitionCacheForURLScheme):
* platform/SchemeRegistry.h:
* platform/ios/WebCoreSystemInterfaceIOS.mm:
* platform/mac/WebCoreSystemInterface.h:
* platform/mac/WebCoreSystemInterface.mm:
* platform/network/ResourceRequestBase.cpp:
(WebCore::ResourceRequestBase::setAsIsolatedCopy):
(WebCore::ResourceRequestBase::setCachePartition):
(WebCore::ResourceRequestBase::partitionName):
* platform/network/ResourceRequestBase.h:
(WebCore::ResourceRequestBase::cachePartition):
(WebCore::ResourceRequestBase::setDomainForCachePartition):
* platform/network/cf/ResourceRequest.h:
(WebCore::ResourceRequest::cachePartition): Deleted.
(WebCore::ResourceRequest::setCachePartition): Deleted.
(WebCore::ResourceRequest::setDomainForCachePartition): Deleted.
* platform/network/cf/ResourceRequestCFNet.cpp:
(WebCore::ResourceRequest::doUpdatePlatformRequest):
(WebCore::ResourceRequest::doUpdateResourceRequest):
(WebCore::ResourceRequest::partitionName): Deleted.
(WebCore::ResourceRequest::doPlatformSetAsIsolatedCopy): Deleted.
* platform/network/cf/ResourceResponse.h:
* platform/network/cocoa/ResourceRequestCocoa.mm:
(WebCore::ResourceRequest::doUpdateResourceRequest):
(WebCore::ResourceRequest::doUpdatePlatformRequest):
* testing/Internals.cpp:
(WebCore::Internals::isLoadingFromMemoryCache):
Source/WebKit/mac:
* Misc/WebCache.mm:
(+[WebCache addImageToCache:forURL:forFrame:]):
(+[WebCache removeImageFromCacheForURL:forFrame:]):
* WebCoreSupport/WebSystemInterface.mm:
(InitWebCoreSystemInterface):
Source/WebKit2:
* NetworkProcess/NetworkResourceLoader.cpp:
(WebKit::NetworkResourceLoader::didRetrieveCacheEntry):
* NetworkProcess/cache/NetworkCache.cpp:
(WebKit::NetworkCache::Cache::makeCacheKey):
* NetworkProcess/cache/NetworkCacheSpeculativeLoadManager.cpp:
(WebKit::NetworkCache::constructRevalidationRequest):
* Shared/WebCoreArgumentCoders.cpp:
(IPC::ArgumentCoder<ResourceRequest>::encode):
(IPC::ArgumentCoder<ResourceRequest>::decode):
* Shared/WebProcessCreationParameters.cpp:
(WebKit::WebProcessCreationParameters::encode):
(WebKit::WebProcessCreationParameters::decode):
* Shared/WebProcessCreationParameters.h:
* UIProcess/API/C/WKContext.cpp:
(WKContextRegisterURLSchemeAsCachePartitioned):
* UIProcess/WebProcessPool.cpp:
(WebKit::m_hiddenPageThrottlingTimer):
(WebKit::WebProcessPool::createNewWebProcess):
(WebKit::WebProcessPool::registerURLSchemeAsCachePartitioned):
* UIProcess/WebProcessPool.h:
* WebProcess/WebCoreSupport/mac/WebSystemInterface.mm:
(InitWebCoreSystemInterface):
* WebProcess/WebProcess.cpp:
(WebKit::WebProcess::initializeWebProcess):
(WebKit::WebProcess::registerURLSchemeAsCachePartitioned):
* WebProcess/WebProcess.h:
* WebProcess/WebProcess.messages.in:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModuleswebsocketsWebSocketChannelcpp">trunk/Source/WebCore/Modules/websockets/WebSocketChannel.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="#trunkSourceWebCoreloaderFrameLoadercpp">trunk/Source/WebCore/loader/FrameLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderarchivecfLegacyWebArchivecpp">trunk/Source/WebCore/loader/archive/cf/LegacyWebArchive.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="#trunkSourceWebCoreloadercacheCachedResourceRequestcpp">trunk/Source/WebCore/loader/cache/CachedResourceRequest.cpp</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedResourceRequesth">trunk/Source/WebCore/loader/cache/CachedResourceRequest.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="#trunkSourceWebCorepageSecurityOrigincpp">trunk/Source/WebCore/page/SecurityOrigin.cpp</a></li>
<li><a href="#trunkSourceWebCorepageSecurityOriginh">trunk/Source/WebCore/page/SecurityOrigin.h</a></li>
<li><a href="#trunkSourceWebCoreplatformSchemeRegistrycpp">trunk/Source/WebCore/platform/SchemeRegistry.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformSchemeRegistryh">trunk/Source/WebCore/platform/SchemeRegistry.h</a></li>
<li><a href="#trunkSourceWebCoreplatformiosWebCoreSystemInterfaceIOSmm">trunk/Source/WebCore/platform/ios/WebCoreSystemInterfaceIOS.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformmacWebCoreSystemInterfaceh">trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmacWebCoreSystemInterfacemm">trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkResourceHandleInternalh">trunk/Source/WebCore/platform/network/ResourceHandleInternal.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkResourceRequestBasecpp">trunk/Source/WebCore/platform/network/ResourceRequestBase.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkResourceRequestBaseh">trunk/Source/WebCore/platform/network/ResourceRequestBase.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcfResourceHandleCFNetcpp">trunk/Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcfResourceRequesth">trunk/Source/WebCore/platform/network/cf/ResourceRequest.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcfResourceRequestCFNetcpp">trunk/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcfResourceResponseh">trunk/Source/WebCore/platform/network/cf/ResourceResponse.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcocoaResourceRequestCocoamm">trunk/Source/WebCore/platform/network/cocoa/ResourceRequestCocoa.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcurlResourceHandleCurlcpp">trunk/Source/WebCore/platform/network/curl/ResourceHandleCurl.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcurlResourceHandleManagercpp">trunk/Source/WebCore/platform/network/curl/ResourceHandleManager.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkmacResourceHandleMacmm">trunk/Source/WebCore/platform/network/mac/ResourceHandleMac.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworksoupResourceHandleSoupcpp">trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp</a></li>
<li><a href="#trunkSourceWebCoretestingInternalscpp">trunk/Source/WebCore/testing/Internals.cpp</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacMiscWebCachemm">trunk/Source/WebKit/mac/Misc/WebCache.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebSystemInterfacemm">trunk/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkDataTaskcpp">trunk/Source/WebKit2/NetworkProcess/NetworkDataTask.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkResourceLoadercpp">trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCachecpp">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheSpeculativeLoadManagercpp">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoadManager.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedWebCoreArgumentCoderscpp">trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedWebProcessCreationParameterscpp">trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedWebProcessCreationParametersh">trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKContextcpp">trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebProcessPoolcpp">trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebProcessPoolh">trunk/Source/WebKit2/UIProcess/WebProcessPool.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsPluginViewcpp">trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportmacWebSystemInterfacemm">trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebProcesscpp">trunk/Source/WebKit2/WebProcess/WebProcess.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebProcessh">trunk/Source/WebKit2/WebProcess/WebProcess.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebProcessmessagesin">trunk/Source/WebKit2/WebProcess/WebProcess.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 (211945 => 211946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-02-09 10:41:16 UTC (rev 211945)
+++ trunk/Source/WebCore/ChangeLog 2017-02-09 11:09:28 UTC (rev 211946)
</span><span class="lines">@@ -1,3 +1,74 @@
</span><ins>+2017-02-09 Antti Koivisto <antti@apple.com>
+
+ Remove most cases of #if ENABLE(CACHE_PARTITIONING)
+ https://bugs.webkit.org/show_bug.cgi?id=167990
+
+ Reviewed by Sam Weinig.
+
+ We'll just return empty string for the partition if partitioning is not enabled.
+
+ * html/DOMURL.cpp:
+ (WebCore::DOMURL::revokeObjectURL):
+ * inspector/InspectorPageAgent.cpp:
+ (WebCore::InspectorPageAgent::cachedResource):
+ * loader/FrameLoader.cpp:
+ (WebCore::FrameLoader::loadURL):
+ * loader/archive/cf/LegacyWebArchive.cpp:
+ (WebCore::LegacyWebArchive::create):
+ * loader/cache/CachedResource.h:
+ (WebCore::CachedResource::url):
+ (WebCore::CachedResource::cachePartition):
+ * loader/cache/CachedResourceLoader.cpp:
+ (WebCore::CachedResourceLoader::requestUserCSSStyleSheet):
+ (WebCore::CachedResourceLoader::requestResource):
+ * loader/cache/CachedResourceRequest.cpp:
+ (WebCore::CachedResourceRequest::setDomainForCachePartition):
+ * loader/cache/CachedResourceRequest.h:
+ * loader/cache/MemoryCache.cpp:
+ (WebCore::MemoryCache::add):
+ (WebCore::MemoryCache::revalidationSucceeded):
+ (WebCore::MemoryCache::resourceForRequestImpl):
+ (WebCore::MemoryCache::addImageToCache):
+ (WebCore::MemoryCache::removeImageFromCache):
+ (WebCore::MemoryCache::remove):
+ (WebCore::MemoryCache::removeResourcesWithOrigin):
+ (WebCore::MemoryCache::removeResourcesWithOrigins):
+ (WebCore::MemoryCache::getOriginsWithCache):
+ (WebCore::MemoryCache::originsWithCache):
+ * loader/cache/MemoryCache.h:
+ * page/SecurityOrigin.cpp:
+ (WebCore::SecurityOrigin::domainForCachePartition):
+ * page/SecurityOrigin.h:
+ * platform/SchemeRegistry.cpp:
+ (WebCore::cachePartitioningSchemes):
+ (WebCore::SchemeRegistry::shouldPartitionCacheForURLScheme):
+ * platform/SchemeRegistry.h:
+ * platform/ios/WebCoreSystemInterfaceIOS.mm:
+ * platform/mac/WebCoreSystemInterface.h:
+ * platform/mac/WebCoreSystemInterface.mm:
+ * platform/network/ResourceRequestBase.cpp:
+ (WebCore::ResourceRequestBase::setAsIsolatedCopy):
+ (WebCore::ResourceRequestBase::setCachePartition):
+ (WebCore::ResourceRequestBase::partitionName):
+ * platform/network/ResourceRequestBase.h:
+ (WebCore::ResourceRequestBase::cachePartition):
+ (WebCore::ResourceRequestBase::setDomainForCachePartition):
+ * platform/network/cf/ResourceRequest.h:
+ (WebCore::ResourceRequest::cachePartition): Deleted.
+ (WebCore::ResourceRequest::setCachePartition): Deleted.
+ (WebCore::ResourceRequest::setDomainForCachePartition): Deleted.
+ * platform/network/cf/ResourceRequestCFNet.cpp:
+ (WebCore::ResourceRequest::doUpdatePlatformRequest):
+ (WebCore::ResourceRequest::doUpdateResourceRequest):
+ (WebCore::ResourceRequest::partitionName): Deleted.
+ (WebCore::ResourceRequest::doPlatformSetAsIsolatedCopy): Deleted.
+ * platform/network/cf/ResourceResponse.h:
+ * platform/network/cocoa/ResourceRequestCocoa.mm:
+ (WebCore::ResourceRequest::doUpdateResourceRequest):
+ (WebCore::ResourceRequest::doUpdatePlatformRequest):
+ * testing/Internals.cpp:
+ (WebCore::Internals::isLoadingFromMemoryCache):
+
</ins><span class="cx"> 2017-02-09 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><span class="cx"> Add Web Bluetooth as Not Considering
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebsocketsWebSocketChannelcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/websockets/WebSocketChannel.cpp (211945 => 211946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/websockets/WebSocketChannel.cpp 2017-02-09 10:41:16 UTC (rev 211945)
+++ trunk/Source/WebCore/Modules/websockets/WebSocketChannel.cpp 2017-02-09 11:09:28 UTC (rev 211946)
</span><span class="lines">@@ -124,11 +124,7 @@
</span><span class="cx"> ref();
</span><span class="cx"> Page* page = frame->page();
</span><span class="cx"> SessionID sessionID = page ? page->sessionID() : SessionID::defaultSessionID();
</span><del>-#if ENABLE(CACHE_PARTITIONING)
</del><span class="cx"> String partition = m_document->topDocument().securityOrigin().domainForCachePartition();
</span><del>-#else
- String partition = emptyString();
-#endif
</del><span class="cx"> m_handle = m_socketProvider->createSocketStreamHandle(m_handshake->url(), *this, sessionID, partition);
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlDOMURLcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/DOMURL.cpp (211945 => 211946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/DOMURL.cpp 2017-02-09 10:41:16 UTC (rev 211945)
+++ trunk/Source/WebCore/html/DOMURL.cpp 2017-02-09 11:09:28 UTC (rev 211946)
</span><span class="lines">@@ -120,9 +120,8 @@
</span><span class="cx"> {
</span><span class="cx"> URL url(URL(), urlString);
</span><span class="cx"> ResourceRequest request(url);
</span><del>-#if ENABLE(CACHE_PARTITIONING)
</del><span class="cx"> request.setDomainForCachePartition(scriptExecutionContext.topOrigin().domainForCachePartition());
</span><del>-#endif
</del><ins>+
</ins><span class="cx"> MemoryCache::removeRequestFromSessionCaches(scriptExecutionContext, request);
</span><span class="cx">
</span><span class="cx"> scriptExecutionContext.publicURLManager().revoke(url);
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorPageAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorPageAgent.cpp (211945 => 211946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorPageAgent.cpp 2017-02-09 10:41:16 UTC (rev 211945)
+++ trunk/Source/WebCore/inspector/InspectorPageAgent.cpp 2017-02-09 11:09:28 UTC (rev 211946)
</span><span class="lines">@@ -260,9 +260,7 @@
</span><span class="cx"> CachedResource* cachedResource = frame->document()->cachedResourceLoader().cachedResource(MemoryCache::removeFragmentIdentifierIfNeeded(url));
</span><span class="cx"> if (!cachedResource) {
</span><span class="cx"> ResourceRequest request(url);
</span><del>-#if ENABLE(CACHE_PARTITIONING)
</del><span class="cx"> request.setDomainForCachePartition(frame->document()->topOrigin().domainForCachePartition());
</span><del>-#endif
</del><span class="cx"> cachedResource = MemoryCache::singleton().resourceForRequest(request, frame->page()->sessionID());
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderFrameLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/FrameLoader.cpp (211945 => 211946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/FrameLoader.cpp 2017-02-09 10:41:16 UTC (rev 211945)
+++ trunk/Source/WebCore/loader/FrameLoader.cpp 2017-02-09 11:09:28 UTC (rev 211946)
</span><span class="lines">@@ -1201,10 +1201,9 @@
</span><span class="cx"> RefPtr<SecurityOrigin> referrerOrigin = SecurityOrigin::createFromString(referrer);
</span><span class="cx"> addHTTPOriginIfNeeded(request, referrerOrigin->toString());
</span><span class="cx"> }
</span><del>-#if ENABLE(CACHE_PARTITIONING)
</del><span class="cx"> if (&m_frame.tree().top() != &m_frame)
</span><span class="cx"> request.setDomainForCachePartition(m_frame.tree().top().document()->securityOrigin().domainForCachePartition());
</span><del>-#endif
</del><ins>+
</ins><span class="cx"> addExtraFieldsToRequest(request, newLoadType, true);
</span><span class="cx"> if (newLoadType == FrameLoadType::Reload || newLoadType == FrameLoadType::ReloadFromOrigin)
</span><span class="cx"> request.setCachePolicy(ReloadIgnoringCacheData);
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderarchivecfLegacyWebArchivecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/archive/cf/LegacyWebArchive.cpp (211945 => 211946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/archive/cf/LegacyWebArchive.cpp 2017-02-09 10:41:16 UTC (rev 211945)
+++ trunk/Source/WebCore/loader/archive/cf/LegacyWebArchive.cpp 2017-02-09 11:09:28 UTC (rev 211946)
</span><span class="lines">@@ -514,9 +514,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ResourceRequest request(subresourceURL);
</span><del>-#if ENABLE(CACHE_PARTITIONING)
</del><span class="cx"> request.setDomainForCachePartition(frame.document()->topOrigin().domainForCachePartition());
</span><del>-#endif
</del><ins>+
</ins><span class="cx"> if (auto* cachedResource = MemoryCache::singleton().resourceForRequest(request, frame.page()->sessionID())) {
</span><span class="cx"> if (auto resource = ArchiveResource::create(cachedResource->resourceBuffer(), subresourceURL, cachedResource->response())) {
</span><span class="cx"> subresources.append(resource.releaseNonNull());
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedResourceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedResource.h (211945 => 211946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedResource.h 2017-02-09 10:41:16 UTC (rev 211945)
+++ trunk/Source/WebCore/loader/cache/CachedResource.h 2017-02-09 11:09:28 UTC (rev 211946)
</span><span class="lines">@@ -114,9 +114,7 @@
</span><span class="cx"> const ResourceRequest& resourceRequest() const { return m_resourceRequest; }
</span><span class="cx"> ResourceRequest& resourceRequest() { return m_resourceRequest; }
</span><span class="cx"> const URL& url() const { return m_resourceRequest.url();}
</span><del>-#if ENABLE(CACHE_PARTITIONING)
</del><span class="cx"> const String& cachePartition() const { return m_resourceRequest.cachePartition(); }
</span><del>-#endif
</del><span class="cx"> SessionID sessionID() const { return m_sessionID; }
</span><span class="cx"> Type type() const { return m_type; }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedResourceLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp (211945 => 211946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp 2017-02-09 10:41:16 UTC (rev 211945)
+++ trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp 2017-02-09 11:09:28 UTC (rev 211946)
</span><span class="lines">@@ -217,10 +217,8 @@
</span><span class="cx">
</span><span class="cx"> CachedResourceHandle<CachedCSSStyleSheet> CachedResourceLoader::requestUserCSSStyleSheet(CachedResourceRequest&& request)
</span><span class="cx"> {
</span><del>-#if ENABLE(CACHE_PARTITIONING)
</del><span class="cx"> ASSERT(document());
</span><span class="cx"> request.setDomainForCachePartition(*document());
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> auto& memoryCache = MemoryCache::singleton();
</span><span class="cx"> if (request.allowsCaching()) {
</span><span class="lines">@@ -733,10 +731,8 @@
</span><span class="cx">
</span><span class="cx"> // See if we can use an existing resource from the cache.
</span><span class="cx"> CachedResourceHandle<CachedResource> resource;
</span><del>-#if ENABLE(CACHE_PARTITIONING)
</del><span class="cx"> if (document())
</span><span class="cx"> request.setDomainForCachePartition(*document());
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> if (request.allowsCaching())
</span><span class="cx"> resource = memoryCache.resourceForRequest(request.resourceRequest(), sessionID());
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedResourceRequestcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedResourceRequest.cpp (211945 => 211946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedResourceRequest.cpp 2017-02-09 10:41:16 UTC (rev 211945)
+++ trunk/Source/WebCore/loader/cache/CachedResourceRequest.cpp 2017-02-09 11:09:28 UTC (rev 211946)
</span><span class="lines">@@ -129,12 +129,10 @@
</span><span class="cx"> upgradeInsecureResourceRequestIfNeeded(m_resourceRequest, document);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(CACHE_PARTITIONING)
</del><span class="cx"> void CachedResourceRequest::setDomainForCachePartition(Document& document)
</span><span class="cx"> {
</span><span class="cx"> m_resourceRequest.setDomainForCachePartition(document.topOrigin().domainForCachePartition());
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> static inline String acceptHeaderValueFromType(CachedResource::Type type)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedResourceRequesth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedResourceRequest.h (211945 => 211946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedResourceRequest.h 2017-02-09 10:41:16 UTC (rev 211945)
+++ trunk/Source/WebCore/loader/cache/CachedResourceRequest.h 2017-02-09 11:09:28 UTC (rev 211946)
</span><span class="lines">@@ -75,9 +75,7 @@
</span><span class="cx"> #if ENABLE(CONTENT_EXTENSIONS)
</span><span class="cx"> void applyBlockedStatus(const ContentExtensions::BlockedStatus&);
</span><span class="cx"> #endif
</span><del>-#if ENABLE(CACHE_PARTITIONING)
</del><span class="cx"> void setDomainForCachePartition(Document&);
</span><del>-#endif
</del><span class="cx"> bool isLinkPreload() const { return m_isLinkPreload; }
</span><span class="cx"> void setIsLinkPreload() { m_isLinkPreload = true; }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheMemoryCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/MemoryCache.cpp (211945 => 211946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/MemoryCache.cpp 2017-02-09 10:41:16 UTC (rev 211945)
+++ trunk/Source/WebCore/loader/cache/MemoryCache.cpp 2017-02-09 11:09:28 UTC (rev 211946)
</span><span class="lines">@@ -115,11 +115,8 @@
</span><span class="cx">
</span><span class="cx"> ASSERT(WTF::isMainThread());
</span><span class="cx">
</span><del>-#if ENABLE(CACHE_PARTITIONING)
</del><span class="cx"> auto key = std::make_pair(resource.url(), resource.cachePartition());
</span><del>-#else
- auto& key = resource.url();
-#endif
</del><ins>+
</ins><span class="cx"> ensureSessionResourceMap(resource.sessionID()).set(key, &resource);
</span><span class="cx"> resource.setInCache(true);
</span><span class="cx">
</span><span class="lines">@@ -144,11 +141,8 @@
</span><span class="cx"> remove(revalidatingResource);
</span><span class="cx">
</span><span class="cx"> auto& resources = ensureSessionResourceMap(resource.sessionID());
</span><del>-#if ENABLE(CACHE_PARTITIONING)
</del><span class="cx"> auto key = std::make_pair(resource.url(), resource.cachePartition());
</span><del>-#else
- auto& key = resource.url();
-#endif
</del><ins>+
</ins><span class="cx"> ASSERT(!resources.get(key));
</span><span class="cx"> resources.set(key, &resource);
</span><span class="cx"> resource.setInCache(true);
</span><span class="lines">@@ -189,11 +183,7 @@
</span><span class="cx"> ASSERT(WTF::isMainThread());
</span><span class="cx"> URL url = removeFragmentIdentifierIfNeeded(request.url());
</span><span class="cx">
</span><del>-#if ENABLE(CACHE_PARTITIONING)
</del><span class="cx"> auto key = std::make_pair(url, request.cachePartition());
</span><del>-#else
- auto& key = url;
-#endif
</del><span class="cx"> return resources.get(key);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -232,9 +222,8 @@
</span><span class="cx">
</span><span class="cx"> cachedImage->addClient(dummyCachedImageClient());
</span><span class="cx"> cachedImage->setDecodedSize(bitmapImage->decodedSize());
</span><del>-#if ENABLE(CACHE_PARTITIONING)
</del><span class="cx"> cachedImage->resourceRequest().setDomainForCachePartition(domainForCachePartition);
</span><del>-#endif
</del><ins>+
</ins><span class="cx"> return add(*cachedImage.release());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -244,12 +233,8 @@
</span><span class="cx"> if (!resources)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>-#if ENABLE(CACHE_PARTITIONING)
</del><span class="cx"> auto key = std::make_pair(url, ResourceRequest::partitionName(domainForCachePartition));
</span><del>-#else
- UNUSED_PARAM(domainForCachePartition);
- auto& key = url;
-#endif
</del><ins>+
</ins><span class="cx"> CachedResource* resource = resources->get(key);
</span><span class="cx"> if (!resource)
</span><span class="cx"> return;
</span><span class="lines">@@ -439,11 +424,8 @@
</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><span class="cx"> if (auto* resources = sessionResourceMap(resource.sessionID())) {
</span><del>-#if ENABLE(CACHE_PARTITIONING)
</del><span class="cx"> auto key = std::make_pair(resource.url(), resource.cachePartition());
</span><del>-#else
- auto& key = resource.url();
-#endif
</del><ins>+
</ins><span class="cx"> if (resource.inCache()) {
</span><span class="cx"> // Remove resource from the resource map.
</span><span class="cx"> resources->remove(key);
</span><span class="lines">@@ -527,21 +509,17 @@
</span><span class="cx">
</span><span class="cx"> void MemoryCache::removeResourcesWithOrigin(SecurityOrigin& origin)
</span><span class="cx"> {
</span><del>-#if ENABLE(CACHE_PARTITIONING)
</del><span class="cx"> String originPartition = ResourceRequest::partitionName(origin.host());
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> Vector<CachedResource*> resourcesWithOrigin;
</span><span class="cx"> for (auto& resources : m_sessionResources.values()) {
</span><span class="cx"> for (auto& keyValue : *resources) {
</span><span class="cx"> auto& resource = *keyValue.value;
</span><del>-#if ENABLE(CACHE_PARTITIONING)
</del><span class="cx"> auto& partitionName = keyValue.key.second;
</span><span class="cx"> if (partitionName == originPartition) {
</span><span class="cx"> resourcesWithOrigin.append(&resource);
</span><span class="cx"> continue;
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx"> RefPtr<SecurityOrigin> resourceOrigin = SecurityOrigin::create(resource.url());
</span><span class="cx"> if (resourceOrigin->equal(&origin))
</span><span class="cx"> resourcesWithOrigin.append(&resource);
</span><span class="lines">@@ -558,25 +536,19 @@
</span><span class="cx"> if (!resourceMap)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>-#if ENABLE(CACHE_PARTITIONING)
</del><span class="cx"> HashSet<String> originPartitions;
</span><span class="cx">
</span><span class="cx"> for (auto& origin : origins)
</span><span class="cx"> originPartitions.add(ResourceRequest::partitionName(origin->host()));
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> Vector<CachedResource*> resourcesToRemove;
</span><span class="cx"> for (auto& keyValuePair : *resourceMap) {
</span><span class="cx"> auto& resource = *keyValuePair.value;
</span><del>-
-#if ENABLE(CACHE_PARTITIONING)
</del><span class="cx"> auto& partitionName = keyValuePair.key.second;
</span><span class="cx"> if (originPartitions.contains(partitionName)) {
</span><span class="cx"> resourcesToRemove.append(&resource);
</span><span class="cx"> continue;
</span><span class="cx"> }
</span><del>-#endif
-
</del><span class="cx"> if (origins.contains(SecurityOrigin::create(resource.url()).ptr()))
</span><span class="cx"> resourcesToRemove.append(&resource);
</span><span class="cx"> }
</span><span class="lines">@@ -587,19 +559,14 @@
</span><span class="cx">
</span><span class="cx"> void MemoryCache::getOriginsWithCache(SecurityOriginSet& origins)
</span><span class="cx"> {
</span><del>-#if ENABLE(CACHE_PARTITIONING)
- static NeverDestroyed<String> httpString("http");
-#endif
</del><span class="cx"> for (auto& resources : m_sessionResources.values()) {
</span><span class="cx"> for (auto& keyValue : *resources) {
</span><span class="cx"> auto& resource = *keyValue.value;
</span><del>-#if ENABLE(CACHE_PARTITIONING)
</del><span class="cx"> auto& partitionName = keyValue.key.second;
</span><span class="cx"> if (!partitionName.isEmpty())
</span><del>- origins.add(SecurityOrigin::create(httpString, partitionName, 0));
</del><ins>+ origins.add(SecurityOrigin::create(ASCIILiteral("http"), partitionName, 0));
</ins><span class="cx"> else
</span><del>-#endif
- origins.add(SecurityOrigin::create(resource.url()));
</del><ins>+ origins.add(SecurityOrigin::create(resource.url()));
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -612,13 +579,11 @@
</span><span class="cx"> if (it != m_sessionResources.end()) {
</span><span class="cx"> for (auto& keyValue : *it->value) {
</span><span class="cx"> auto& resource = *keyValue.value;
</span><del>-#if ENABLE(CACHE_PARTITIONING)
</del><span class="cx"> auto& partitionName = keyValue.key.second;
</span><span class="cx"> if (!partitionName.isEmpty())
</span><span class="cx"> origins.add(SecurityOrigin::create("http", partitionName, 0));
</span><span class="cx"> else
</span><del>-#endif
- origins.add(SecurityOrigin::create(resource.url()));
</del><ins>+ origins.add(SecurityOrigin::create(resource.url()));
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheMemoryCacheh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/MemoryCache.h (211945 => 211946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/MemoryCache.h 2017-02-09 10:41:16 UTC (rev 211945)
+++ trunk/Source/WebCore/loader/cache/MemoryCache.h 2017-02-09 11:09:28 UTC (rev 211946)
</span><span class="lines">@@ -168,11 +168,7 @@
</span><span class="cx"> WEBCORE_EXPORT void pruneLiveResourcesToSize(unsigned targetSize, bool shouldDestroyDecodedDataForAllLiveResources = false);
</span><span class="cx">
</span><span class="cx"> private:
</span><del>-#if ENABLE(CACHE_PARTITIONING)
</del><span class="cx"> typedef HashMap<std::pair<URL, String /* partitionName */>, CachedResource*> CachedResourceMap;
</span><del>-#else
- typedef HashMap<URL, CachedResource*> CachedResourceMap;
-#endif
</del><span class="cx"> typedef ListHashSet<CachedResource*> LRUList;
</span><span class="cx">
</span><span class="cx"> MemoryCache();
</span></span></pre></div>
<a id="trunkSourceWebCorepageSecurityOrigincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/SecurityOrigin.cpp (211945 => 211946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/SecurityOrigin.cpp 2017-02-09 10:41:16 UTC (rev 211945)
+++ trunk/Source/WebCore/page/SecurityOrigin.cpp 2017-02-09 11:09:28 UTC (rev 211946)
</span><span class="lines">@@ -395,7 +395,6 @@
</span><span class="cx"> m_needsStorageAccessFromFileURLsQuirk = true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(CACHE_PARTITIONING)
</del><span class="cx"> String SecurityOrigin::domainForCachePartition() const
</span><span class="cx"> {
</span><span class="cx"> if (m_storageBlockingPolicy != BlockThirdPartyStorage)
</span><span class="lines">@@ -409,7 +408,6 @@
</span><span class="cx">
</span><span class="cx"> return emptyString();
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> void SecurityOrigin::enforceFilePathSeparation()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCorepageSecurityOriginh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/SecurityOrigin.h (211945 => 211946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/SecurityOrigin.h 2017-02-09 10:41:16 UTC (rev 211945)
+++ trunk/Source/WebCore/page/SecurityOrigin.h 2017-02-09 11:09:28 UTC (rev 211946)
</span><span class="lines">@@ -138,9 +138,7 @@
</span><span class="cx"> void grantStorageAccessFromFileURLsQuirk();
</span><span class="cx"> bool needsStorageAccessFromFileURLsQuirk() const { return m_needsStorageAccessFromFileURLsQuirk; }
</span><span class="cx">
</span><del>-#if ENABLE(CACHE_PARTITIONING)
</del><span class="cx"> WEBCORE_EXPORT String domainForCachePartition() const;
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> bool canAccessDatabase(const SecurityOrigin& topOrigin) const { return canAccessStorage(&topOrigin); };
</span><span class="cx"> bool canAccessSessionStorage(const SecurityOrigin& topOrigin) const { return canAccessStorage(&topOrigin, AlwaysAllowFromThirdParty); }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformSchemeRegistrycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/SchemeRegistry.cpp (211945 => 211946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/SchemeRegistry.cpp 2017-02-09 10:41:16 UTC (rev 211945)
+++ trunk/Source/WebCore/platform/SchemeRegistry.cpp 2017-02-09 11:09:28 UTC (rev 211946)
</span><span class="lines">@@ -167,13 +167,11 @@
</span><span class="cx"> return schemes;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(CACHE_PARTITIONING)
</del><span class="cx"> static URLSchemesMap& cachePartitioningSchemes()
</span><span class="cx"> {
</span><span class="cx"> static NeverDestroyed<URLSchemesMap> schemes;
</span><span class="cx"> return schemes;
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> static URLSchemesMap& alwaysRevalidatedSchemes()
</span><span class="cx"> {
</span><span class="lines">@@ -343,7 +341,6 @@
</span><span class="cx"> return alwaysRevalidatedSchemes().contains(scheme);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(CACHE_PARTITIONING)
</del><span class="cx"> void SchemeRegistry::registerURLSchemeAsCachePartitioned(const String& scheme)
</span><span class="cx"> {
</span><span class="cx"> cachePartitioningSchemes().add(scheme);
</span><span class="lines">@@ -355,7 +352,6 @@
</span><span class="cx"> return false;
</span><span class="cx"> return cachePartitioningSchemes().contains(scheme);
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> bool SchemeRegistry::isUserExtensionScheme(const String& scheme)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformSchemeRegistryh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/SchemeRegistry.h (211945 => 211946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/SchemeRegistry.h 2017-02-09 10:41:16 UTC (rev 211945)
+++ trunk/Source/WebCore/platform/SchemeRegistry.h 2017-02-09 11:09:28 UTC (rev 211946)
</span><span class="lines">@@ -94,11 +94,9 @@
</span><span class="cx"> WEBCORE_EXPORT static void registerURLSchemeAsAlwaysRevalidated(const String&);
</span><span class="cx"> static bool shouldAlwaysRevalidateURLScheme(const String&);
</span><span class="cx">
</span><del>-#if ENABLE(CACHE_PARTITIONING)
</del><span class="cx"> // Schemes whose requests should be partitioned in the cache
</span><span class="cx"> WEBCORE_EXPORT static void registerURLSchemeAsCachePartitioned(const String& scheme);
</span><span class="cx"> static bool shouldPartitionCacheForURLScheme(const String& scheme);
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> static bool isUserExtensionScheme(const String& scheme);
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformiosWebCoreSystemInterfaceIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/WebCoreSystemInterfaceIOS.mm (211945 => 211946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/WebCoreSystemInterfaceIOS.mm 2017-02-09 10:41:16 UTC (rev 211945)
+++ trunk/Source/WebCore/platform/ios/WebCoreSystemInterfaceIOS.mm 2017-02-09 11:09:28 UTC (rev 211946)
</span><span class="lines">@@ -66,9 +66,7 @@
</span><span class="cx"> WEBCORE_EXPORT bool (*wkIsPublicSuffix)(NSString *host);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(CACHE_PARTITIONING)
</del><span class="cx"> WEBCORE_EXPORT CFStringRef (*wkCachePartitionKey)(void);
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT int (*wkExernalDeviceTypeForPlayer)(AVPlayer *);
</span><span class="cx"> WEBCORE_EXPORT NSString *(*wkExernalDeviceDisplayNameForPlayer)(AVPlayer *);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacWebCoreSystemInterfaceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h (211945 => 211946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h 2017-02-09 10:41:16 UTC (rev 211945)
+++ trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h 2017-02-09 11:09:28 UTC (rev 211946)
</span><span class="lines">@@ -235,9 +235,7 @@
</span><span class="cx"> extern bool (*wkIsPublicSuffix)(NSString *host);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(CACHE_PARTITIONING)
</del><span class="cx"> extern CFStringRef (*wkCachePartitionKey)(void);
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> typedef enum {
</span><span class="cx"> wkExternalPlaybackTypeNone,
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacWebCoreSystemInterfacemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.mm (211945 => 211946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.mm 2017-02-09 10:41:16 UTC (rev 211945)
+++ trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.mm 2017-02-09 11:09:28 UTC (rev 211946)
</span><span class="lines">@@ -113,9 +113,7 @@
</span><span class="cx"> bool (*wkIsPublicSuffix)(NSString *host);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(CACHE_PARTITIONING)
</del><span class="cx"> CFStringRef (*wkCachePartitionKey)(void);
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> int (*wkExernalDeviceTypeForPlayer)(AVPlayer *);
</span><span class="cx"> NSString *(*wkExernalDeviceDisplayNameForPlayer)(AVPlayer *);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkResourceHandleInternalh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/ResourceHandleInternal.h (211945 => 211946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/ResourceHandleInternal.h 2017-02-09 10:41:16 UTC (rev 211945)
+++ trunk/Source/WebCore/platform/network/ResourceHandleInternal.h 2017-02-09 11:09:28 UTC (rev 211946)
</span><span class="lines">@@ -79,11 +79,7 @@
</span><span class="cx"> , m_client(client)
</span><span class="cx"> , m_firstRequest(request)
</span><span class="cx"> , m_lastHTTPMethod(request.httpMethod())
</span><del>-#if ENABLE(CACHE_PARTITIONING)
</del><span class="cx"> , m_partition(request.cachePartition())
</span><del>-#else
- , m_partition(emptyString())
-#endif
</del><span class="cx"> , m_defersLoading(defersLoading)
</span><span class="cx"> , m_shouldContentSniff(shouldContentSniff)
</span><span class="cx"> , m_usesAsyncCallbacks(client && client->usesAsyncCallbacks())
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkResourceRequestBasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/ResourceRequestBase.cpp (211945 => 211946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/ResourceRequestBase.cpp 2017-02-09 10:41:16 UTC (rev 211945)
+++ trunk/Source/WebCore/platform/network/ResourceRequestBase.cpp 2017-02-09 11:09:28 UTC (rev 211946)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx"> #include "ResourceRequestBase.h"
</span><span class="cx">
</span><span class="cx"> #include "HTTPHeaderNames.h"
</span><ins>+#include "PublicSuffix.h"
</ins><span class="cx"> #include "ResourceRequest.h"
</span><span class="cx"> #include <wtf/PointerComparison.h>
</span><span class="cx">
</span><span class="lines">@@ -66,6 +67,7 @@
</span><span class="cx"> setPriority(other.priority());
</span><span class="cx"> setRequester(other.requester());
</span><span class="cx"> setInitiatorIdentifier(other.initiatorIdentifier().isolatedCopy());
</span><ins>+ setCachePartition(other.cachePartition());
</ins><span class="cx">
</span><span class="cx"> updateResourceRequest();
</span><span class="cx"> m_httpHeaderFields = other.httpHeaderFields().isolatedCopy();
</span><span class="lines">@@ -86,8 +88,6 @@
</span><span class="cx"> if (other.m_httpBody)
</span><span class="cx"> setHTTPBody(other.m_httpBody->isolatedCopy());
</span><span class="cx"> setAllowCookies(other.m_allowCookies);
</span><del>-
- const_cast<ResourceRequest&>(asResourceRequest()).doPlatformSetAsIsolatedCopy(other);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool ResourceRequestBase::isEmpty() const
</span><span class="lines">@@ -640,4 +640,32 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+void ResourceRequestBase::setCachePartition(const String& cachePartition)
+{
+#if ENABLE(CACHE_PARTITIONING)
+ ASSERT(!cachePartition.isNull());
+ ASSERT(cachePartition == partitionName(cachePartition));
+ m_cachePartition = cachePartition;
+#else
+ UNUSED_PARAM(cachePartition);
+#endif
</ins><span class="cx"> }
</span><ins>+
+String ResourceRequestBase::partitionName(const String& domain)
+{
+#if ENABLE(PUBLIC_SUFFIX_LIST)
+ if (domain.isNull())
+ return emptyString();
+ String highLevel = topPrivatelyControlledDomain(domain);
+ if (highLevel.isNull())
+ return emptyString();
+ return highLevel;
+#else
+#if ENABLE(CACHE_PARTITIONING)
+#error Cache partitioning requires PUBLIC_SUFFIX_LIST
+#endif
+ return emptyString();
+#endif
+}
+
+}
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkResourceRequestBaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/ResourceRequestBase.h (211945 => 211946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/ResourceRequestBase.h 2017-02-09 10:41:16 UTC (rev 211945)
+++ trunk/Source/WebCore/platform/network/ResourceRequestBase.h 2017-02-09 11:09:28 UTC (rev 211946)
</span><span class="lines">@@ -136,6 +136,11 @@
</span><span class="cx"> WEBCORE_EXPORT ResourceLoadPriority priority() const;
</span><span class="cx"> WEBCORE_EXPORT void setPriority(ResourceLoadPriority);
</span><span class="cx">
</span><ins>+ WEBCORE_EXPORT static String partitionName(const String& domain);
+ const String& cachePartition() const { return m_cachePartition; }
+ WEBCORE_EXPORT void setCachePartition(const String&);
+ void setDomainForCachePartition(const String& domain) { setCachePartition(partitionName(domain)); }
+
</ins><span class="cx"> WEBCORE_EXPORT bool isConditional() const;
</span><span class="cx"> WEBCORE_EXPORT void makeUnconditional();
</span><span class="cx">
</span><span class="lines">@@ -237,6 +242,7 @@
</span><span class="cx"> ResourceLoadPriority m_priority { ResourceLoadPriority::Low };
</span><span class="cx"> Requester m_requester { Requester::Unspecified };
</span><span class="cx"> String m_initiatorIdentifier;
</span><ins>+ String m_cachePartition { emptyString() };
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> const ResourceRequest& asResourceRequest() const;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcfResourceHandleCFNetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp (211945 => 211946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp 2017-02-09 10:41:16 UTC (rev 211945)
+++ trunk/Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp 2017-02-09 11:09:28 UTC (rev 211946)
</span><span class="lines">@@ -137,11 +137,7 @@
</span><span class="cx"> firstRequest().setURL(urlWithCredentials);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(CACHE_PARTITIONING)
</del><span class="cx"> String partition = firstRequest().cachePartition();
</span><del>-#else
- String partition = emptyString();
-#endif
</del><span class="cx">
</span><span class="cx"> // <rdar://problem/7174050> - For URLs that match the paths of those previously challenged for HTTP Basic authentication,
</span><span class="cx"> // try and reuse the credential preemptively, as allowed by RFC 2617.
</span><span class="lines">@@ -306,11 +302,7 @@
</span><span class="cx"> d->m_lastHTTPMethod = request.httpMethod();
</span><span class="cx"> request.removeCredentials();
</span><span class="cx">
</span><del>-#if ENABLE(CACHE_PARTITIONING)
</del><span class="cx"> String partition = firstRequest().cachePartition();
</span><del>-#else
- String partition = emptyString();
-#endif
</del><span class="cx">
</span><span class="cx"> if (!protocolHostAndPortAreEqual(request.url(), redirectResponse.url())) {
</span><span class="cx"> // The network layer might carry over some headers from the original request that
</span><span class="lines">@@ -395,11 +387,7 @@
</span><span class="cx"> if (!challenge.protectionSpace().isPasswordBased())
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>-#if ENABLE(CACHE_PARTITIONING)
</del><span class="cx"> String partition = firstRequest().cachePartition();
</span><del>-#else
- String partition = emptyString();
-#endif
</del><span class="cx">
</span><span class="cx"> if (!d->m_user.isNull() && !d->m_pass.isNull()) {
</span><span class="cx"> RetainPtr<CFURLCredentialRef> cfCredential = adoptCF(CFURLCredentialCreate(kCFAllocatorDefault, d->m_user.createCFString().get(), d->m_pass.createCFString().get(), 0, kCFURLCredentialPersistenceNone));
</span><span class="lines">@@ -490,14 +478,8 @@
</span><span class="cx"> if (challenge.failureResponse().httpStatusCode() == 401)
</span><span class="cx"> urlToStore = challenge.failureResponse().url();
</span><span class="cx">
</span><del>-#if ENABLE(CACHE_PARTITIONING)
- String partition = firstRequest().cachePartition();
-#else
- String partition = emptyString();
-#endif
</del><ins>+ d->m_context->storageSession().credentialStorage().set(firstRequest().cachePartition(), webCredential, challenge.protectionSpace(), urlToStore);
</ins><span class="cx">
</span><del>- d->m_context->storageSession().credentialStorage().set(partition, webCredential, challenge.protectionSpace(), urlToStore);
-
</del><span class="cx"> if (d->m_connection) {
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> CFURLConnectionUseCredential(d->m_connection.get(), webCredential.cfCredential(), challenge.cfURLAuthChallengeRef());
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcfResourceRequesth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/cf/ResourceRequest.h (211945 => 211946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/cf/ResourceRequest.h 2017-02-09 10:41:16 UTC (rev 211945)
+++ trunk/Source/WebCore/platform/network/cf/ResourceRequest.h 2017-02-09 11:09:28 UTC (rev 211946)
</span><span class="lines">@@ -94,17 +94,6 @@
</span><span class="cx"> WEBCORE_EXPORT static CFStringRef isUserInitiatedKey();
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(CACHE_PARTITIONING)
- WEBCORE_EXPORT static String partitionName(const String& domain);
- const String& cachePartition() const { return m_cachePartition.isNull() ? emptyString() : m_cachePartition; }
- void setCachePartition(const String& cachePartition)
- {
- ASSERT(cachePartition == partitionName(cachePartition));
- m_cachePartition = cachePartition;
- }
- void setDomainForCachePartition(const String& domain) { m_cachePartition = partitionName(domain); }
-#endif
-
</del><span class="cx"> #if PLATFORM(COCOA) || USE(CFURLCONNECTION)
</span><span class="cx"> WEBCORE_EXPORT CFURLRequestRef cfURLRequest(HTTPBodyUpdatePolicy) const;
</span><span class="cx"> void setStorageSession(CFURLStorageSessionRef);
</span><span class="lines">@@ -131,9 +120,6 @@
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> RetainPtr<NSURLRequest> m_nsRequest;
</span><span class="cx"> #endif
</span><del>-#if ENABLE(CACHE_PARTITIONING)
- String m_cachePartition;
-#endif
</del><span class="cx">
</span><span class="cx"> static bool s_httpPipeliningEnabled;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcfResourceRequestCFNetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp (211945 => 211946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp 2017-02-09 10:41:16 UTC (rev 211945)
+++ trunk/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp 2017-02-09 11:09:28 UTC (rev 211946)
</span><span class="lines">@@ -361,32 +361,6 @@
</span><span class="cx"> s_httpPipeliningEnabled = flag;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(CACHE_PARTITIONING)
-String ResourceRequest::partitionName(const String& domain)
-{
- if (domain.isNull())
- return emptyString();
-#if ENABLE(PUBLIC_SUFFIX_LIST)
- String highLevel = topPrivatelyControlledDomain(domain);
- if (highLevel.isNull())
- return emptyString();
- return highLevel;
-#else
- return domain;
-#endif
-}
-#endif
-
-void ResourceRequest::doPlatformSetAsIsolatedCopy(const ResourceRequest& other)
-{
-#if ENABLE(CACHE_PARTITIONING)
- m_cachePartition = other.m_cachePartition.isolatedCopy();
-#else
- UNUSED_PARAM(other);
-#endif
-}
-
-
</del><span class="cx"> // FIXME: It is confusing that this function both sets connection count and determines maximum request count at network layer. This can and should be done separately.
</span><span class="cx"> unsigned initializeMaximumHTTPConnectionCountPerHost()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcfResourceResponseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/cf/ResourceResponse.h (211945 => 211946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/cf/ResourceResponse.h 2017-02-09 10:41:16 UTC (rev 211945)
+++ trunk/Source/WebCore/platform/network/cf/ResourceResponse.h 2017-02-09 11:09:28 UTC (rev 211946)
</span><span class="lines">@@ -103,8 +103,6 @@
</span><span class="cx"> String platformSuggestedFilename() const;
</span><span class="cx"> CertificateInfo platformCertificateInfo() const;
</span><span class="cx">
</span><del>- void doPlatformSetAsIsolatedCopy(const ResourceResponse&) const;
-
</del><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> void initNSURLResponse() const;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcocoaResourceRequestCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/cocoa/ResourceRequestCocoa.mm (211945 => 211946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/cocoa/ResourceRequestCocoa.mm 2017-02-09 10:41:16 UTC (rev 211945)
+++ trunk/Source/WebCore/platform/network/cocoa/ResourceRequestCocoa.mm 2017-02-09 11:09:28 UTC (rev 211946)
</span><span class="lines">@@ -148,13 +148,11 @@
</span><span class="cx"> m_responseContentDispositionEncodingFallbackArray.uncheckedAppend(CFStringConvertEncodingToIANACharSetName(encoding));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(CACHE_PARTITIONING)
</del><span class="cx"> if (m_nsRequest) {
</span><span class="cx"> NSString* cachePartition = [NSURLProtocol propertyForKey:(NSString *)wkCachePartitionKey() inRequest:m_nsRequest.get()];
</span><span class="cx"> if (cachePartition)
</span><span class="cx"> m_cachePartition = cachePartition;
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ResourceRequest::doUpdateResourceHTTPBody()
</span><span class="lines">@@ -218,13 +216,11 @@
</span><span class="cx"> }
</span><span class="cx"> [nsRequest setContentDispositionEncodingFallbackArray:encodingFallbacks];
</span><span class="cx">
</span><del>-#if ENABLE(CACHE_PARTITIONING)
</del><span class="cx"> String partition = cachePartition();
</span><span class="cx"> if (!partition.isNull() && !partition.isEmpty()) {
</span><span class="cx"> NSString *partitionValue = [NSString stringWithUTF8String:partition.utf8().data()];
</span><span class="cx"> [NSURLProtocol setProperty:partitionValue forKey:(NSString *)wkCachePartitionKey() inRequest:nsRequest];
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200)
</span><span class="cx"> if (m_url.isLocalFile()) {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcurlResourceHandleCurlcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/curl/ResourceHandleCurl.cpp (211945 => 211946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/curl/ResourceHandleCurl.cpp 2017-02-09 10:41:16 UTC (rev 211945)
+++ trunk/Source/WebCore/platform/network/curl/ResourceHandleCurl.cpp 2017-02-09 11:09:28 UTC (rev 211946)
</span><span class="lines">@@ -179,11 +179,7 @@
</span><span class="cx">
</span><span class="cx"> void ResourceHandle::didReceiveAuthenticationChallenge(const AuthenticationChallenge& challenge)
</span><span class="cx"> {
</span><del>-#if ENABLE(CACHE_PARTITIONING)
</del><span class="cx"> String partition = firstRequest().cachePartition();
</span><del>-#else
- String partition = emptyString();
-#endif
</del><span class="cx">
</span><span class="cx"> if (!d->m_user.isNull() && !d->m_pass.isNull()) {
</span><span class="cx"> Credential credential(d->m_user, d->m_pass, CredentialPersistenceNone);
</span><span class="lines">@@ -241,11 +237,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(CACHE_PARTITIONING)
</del><span class="cx"> String partition = firstRequest().cachePartition();
</span><del>-#else
- String partition = emptyString();
-#endif
</del><span class="cx">
</span><span class="cx"> if (shouldUseCredentialStorage()) {
</span><span class="cx"> if (challenge.failureResponse().httpStatusCode() == 401) {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcurlResourceHandleManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/curl/ResourceHandleManager.cpp (211945 => 211946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/curl/ResourceHandleManager.cpp 2017-02-09 10:41:16 UTC (rev 211945)
+++ trunk/Source/WebCore/platform/network/curl/ResourceHandleManager.cpp 2017-02-09 11:09:28 UTC (rev 211946)
</span><span class="lines">@@ -1041,11 +1041,7 @@
</span><span class="cx"> // m_user/m_pass are credentials given manually, for instance, by the arguments passed to XMLHttpRequest.open().
</span><span class="cx"> ResourceHandleInternal* d = handle->getInternal();
</span><span class="cx">
</span><del>-#if ENABLE(CACHE_PARTITIONING)
</del><span class="cx"> String partition = handle->firstRequest().cachePartition();
</span><del>-#else
- String partition = emptyString();
-#endif
</del><span class="cx">
</span><span class="cx"> if (handle->shouldUseCredentialStorage()) {
</span><span class="cx"> if (d->m_user.isEmpty() && d->m_pass.isEmpty()) {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkmacResourceHandleMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/mac/ResourceHandleMac.mm (211945 => 211946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/mac/ResourceHandleMac.mm 2017-02-09 10:41:16 UTC (rev 211945)
+++ trunk/Source/WebCore/platform/network/mac/ResourceHandleMac.mm 2017-02-09 11:09:28 UTC (rev 211946)
</span><span class="lines">@@ -151,12 +151,7 @@
</span><span class="cx"> if (d->m_user.isEmpty() && d->m_pass.isEmpty()) {
</span><span class="cx"> // <rdar://problem/7174050> - For URLs that match the paths of those previously challenged for HTTP Basic authentication,
</span><span class="cx"> // try and reuse the credential preemptively, as allowed by RFC 2617.
</span><del>-#if ENABLE(CACHE_PARTITIONING)
- String partition = firstRequest().cachePartition();
-#else
- String partition = emptyString();
-#endif
- d->m_initialCredential = d->m_context->storageSession().credentialStorage().get(partition, firstRequest().url());
</del><ins>+ d->m_initialCredential = d->m_context->storageSession().credentialStorage().get(firstRequest().cachePartition(), firstRequest().url());
</ins><span class="cx"> } else {
</span><span class="cx"> // If there is already a protection space known for the URL, update stored credentials before sending a request.
</span><span class="cx"> // This makes it possible to implement logout by sending an XMLHttpRequest with known incorrect credentials, and aborting it immediately
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworksoupResourceHandleSoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp (211945 => 211946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp 2017-02-09 10:41:16 UTC (rev 211945)
+++ trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp 2017-02-09 11:09:28 UTC (rev 211946)
</span><span class="lines">@@ -201,11 +201,7 @@
</span><span class="cx"> // m_user/m_pass are credentials given manually, for instance, by the arguments passed to XMLHttpRequest.open().
</span><span class="cx"> ResourceHandleInternal* d = handle->getInternal();
</span><span class="cx">
</span><del>-#if ENABLE(CACHE_PARTITIONING)
- String partition = firstRequest().cachePartition();
-#else
- String partition = emptyString();
-#endif
</del><ins>+ String partition = request.cachePartition();
</ins><span class="cx">
</span><span class="cx"> if (handle->shouldUseCredentialStorage()) {
</span><span class="cx"> if (d->m_user.isEmpty() && d->m_pass.isEmpty())
</span><span class="lines">@@ -829,11 +825,7 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(d->m_currentWebChallenge.isNull());
</span><span class="cx">
</span><del>-#if ENABLE(CACHE_PARTITIONING)
</del><span class="cx"> String partition = firstRequest().cachePartition();
</span><del>-#else
- String partition = emptyString();
-#endif
</del><span class="cx">
</span><span class="cx"> // FIXME: Per the specification, the user shouldn't be asked for credentials if there were incorrect ones provided explicitly.
</span><span class="cx"> bool useCredentialStorage = shouldUseCredentialStorage();
</span><span class="lines">@@ -899,11 +891,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(CACHE_PARTITIONING)
</del><span class="cx"> String partition = firstRequest().cachePartition();
</span><del>-#else
- String partition = emptyString();
-#endif
</del><span class="cx">
</span><span class="cx"> if (shouldUseCredentialStorage()) {
</span><span class="cx"> // Eventually we will manage per-session credentials only internally or use some newly-exposed API from libsoup,
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.cpp (211945 => 211946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.cpp 2017-02-09 10:41:16 UTC (rev 211945)
+++ trunk/Source/WebCore/testing/Internals.cpp 2017-02-09 11:09:28 UTC (rev 211946)
</span><span class="lines">@@ -563,9 +563,8 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> ResourceRequest request(contextDocument()->completeURL(url));
</span><del>-#if ENABLE(CACHE_PARTITIONING)
</del><span class="cx"> request.setDomainForCachePartition(contextDocument()->topOrigin().domainForCachePartition());
</span><del>-#endif
</del><ins>+
</ins><span class="cx"> CachedResource* resource = MemoryCache::singleton().resourceForRequest(request, contextDocument()->page()->sessionID());
</span><span class="cx"> return resource && resource->status() == CachedResource::Cached;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (211945 => 211946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2017-02-09 10:41:16 UTC (rev 211945)
+++ trunk/Source/WebKit/mac/ChangeLog 2017-02-09 11:09:28 UTC (rev 211946)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2017-02-09 Antti Koivisto <antti@apple.com>
+
+ Remove most cases of #if ENABLE(CACHE_PARTITIONING)
+ https://bugs.webkit.org/show_bug.cgi?id=167990
+
+ Reviewed by Sam Weinig.
+
+ * Misc/WebCache.mm:
+ (+[WebCache addImageToCache:forURL:forFrame:]):
+ (+[WebCache removeImageFromCacheForURL:forFrame:]):
+ * WebCoreSupport/WebSystemInterface.mm:
+ (InitWebCoreSystemInterface):
+
</ins><span class="cx"> 2017-02-07 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> Don't migrate WebKit DOM headers in MigrateHeaders.make
</span></span></pre></div>
<a id="trunkSourceWebKitmacMiscWebCachemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Misc/WebCache.mm (211945 => 211946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Misc/WebCache.mm 2017-02-09 10:41:16 UTC (rev 211945)
+++ trunk/Source/WebKit/mac/Misc/WebCache.mm 2017-02-09 11:09:28 UTC (rev 211946)
</span><span class="lines">@@ -34,6 +34,7 @@
</span><span class="cx"> #import <WebCore/ApplicationCacheStorage.h>
</span><span class="cx"> #import <WebCore/CredentialStorage.h>
</span><span class="cx"> #import <WebCore/CrossOriginPreflightResultCache.h>
</span><ins>+#import <WebCore/Document.h>
</ins><span class="cx"> #import <WebCore/MemoryCache.h>
</span><span class="cx"> #import <runtime/InitializeThreading.h>
</span><span class="cx"> #import <wtf/MainThread.h>
</span><span class="lines">@@ -48,10 +49,6 @@
</span><span class="cx"> #import <WebCore/WebCoreThreadRun.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(CACHE_PARTITIONING)
-#import <WebCore/Document.h>
-#endif
-
</del><span class="cx"> @implementation WebCache
</span><span class="cx">
</span><span class="cx"> + (void)initialize
</span><span class="lines">@@ -168,10 +165,8 @@
</span><span class="cx"> if (!image || !url || ![[url absoluteString] length])
</span><span class="cx"> return false;
</span><span class="cx"> WebCore::SecurityOrigin* topOrigin = nullptr;
</span><del>-#if ENABLE(CACHE_PARTITIONING)
</del><span class="cx"> if (frame)
</span><span class="cx"> topOrigin = &core(frame)->document()->topOrigin();
</span><del>-#endif
</del><span class="cx"> return WebCore::MemoryCache::singleton().addImageToCache(RetainPtr<CGImageRef>(image), url, topOrigin ? topOrigin->domainForCachePartition() : emptyString());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -185,10 +180,8 @@
</span><span class="cx"> if (!url)
</span><span class="cx"> return;
</span><span class="cx"> WebCore::SecurityOrigin* topOrigin = nullptr;
</span><del>-#if ENABLE(CACHE_PARTITIONING)
</del><span class="cx"> if (frame)
</span><span class="cx"> topOrigin = &core(frame)->document()->topOrigin();
</span><del>-#endif
</del><span class="cx"> WebCore::MemoryCache::singleton().removeImageFromCache(url, topOrigin ? topOrigin->domainForCachePartition() : emptyString());
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebSystemInterfacemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm (211945 => 211946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm 2017-02-09 10:41:16 UTC (rev 211945)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm 2017-02-09 11:09:28 UTC (rev 211946)
</span><span class="lines">@@ -124,9 +124,7 @@
</span><span class="cx"> INIT(IsPublicSuffix);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(CACHE_PARTITIONING)
</del><span class="cx"> INIT(CachePartitionKey);
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> INIT(ExernalDeviceTypeForPlayer);
</span><span class="cx"> INIT(ExernalDeviceDisplayNameForPlayer);
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (211945 => 211946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2017-02-09 10:41:16 UTC (rev 211945)
+++ trunk/Source/WebKit2/ChangeLog 2017-02-09 11:09:28 UTC (rev 211946)
</span><span class="lines">@@ -1,3 +1,38 @@
</span><ins>+2017-02-09 Antti Koivisto <antti@apple.com>
+
+ Remove most cases of #if ENABLE(CACHE_PARTITIONING)
+ https://bugs.webkit.org/show_bug.cgi?id=167990
+
+ Reviewed by Sam Weinig.
+
+ * NetworkProcess/NetworkResourceLoader.cpp:
+ (WebKit::NetworkResourceLoader::didRetrieveCacheEntry):
+ * NetworkProcess/cache/NetworkCache.cpp:
+ (WebKit::NetworkCache::Cache::makeCacheKey):
+ * NetworkProcess/cache/NetworkCacheSpeculativeLoadManager.cpp:
+ (WebKit::NetworkCache::constructRevalidationRequest):
+ * Shared/WebCoreArgumentCoders.cpp:
+ (IPC::ArgumentCoder<ResourceRequest>::encode):
+ (IPC::ArgumentCoder<ResourceRequest>::decode):
+ * Shared/WebProcessCreationParameters.cpp:
+ (WebKit::WebProcessCreationParameters::encode):
+ (WebKit::WebProcessCreationParameters::decode):
+ * Shared/WebProcessCreationParameters.h:
+ * UIProcess/API/C/WKContext.cpp:
+ (WKContextRegisterURLSchemeAsCachePartitioned):
+ * UIProcess/WebProcessPool.cpp:
+ (WebKit::m_hiddenPageThrottlingTimer):
+ (WebKit::WebProcessPool::createNewWebProcess):
+ (WebKit::WebProcessPool::registerURLSchemeAsCachePartitioned):
+ * UIProcess/WebProcessPool.h:
+ * WebProcess/WebCoreSupport/mac/WebSystemInterface.mm:
+ (InitWebCoreSystemInterface):
+ * WebProcess/WebProcess.cpp:
+ (WebKit::WebProcess::initializeWebProcess):
+ (WebKit::WebProcess::registerURLSchemeAsCachePartitioned):
+ * WebProcess/WebProcess.h:
+ * WebProcess/WebProcess.messages.in:
+
</ins><span class="cx"> 2017-02-08 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Put names on more UIViews for ease of debugging
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkDataTaskcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkDataTask.cpp (211945 => 211946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkDataTask.cpp 2017-02-09 10:41:16 UTC (rev 211945)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkDataTask.cpp 2017-02-09 11:09:28 UTC (rev 211946)
</span><span class="lines">@@ -63,11 +63,7 @@
</span><span class="cx"> : m_failureTimer(*this, &NetworkDataTask::failureTimerFired)
</span><span class="cx"> , m_session(session)
</span><span class="cx"> , m_client(&client)
</span><del>-#if ENABLE(CACHE_PARTITIONING)
</del><span class="cx"> , m_partition(requestWithCredentials.cachePartition())
</span><del>-#else
- , m_partition(emptyString())
-#endif
</del><span class="cx"> , m_storedCredentials(storedCredentials)
</span><span class="cx"> , m_lastHTTPMethod(requestWithCredentials.httpMethod())
</span><span class="cx"> , m_firstRequest(requestWithCredentials)
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkResourceLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp (211945 => 211946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp 2017-02-09 10:41:16 UTC (rev 211945)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp 2017-02-09 11:09:28 UTC (rev 211946)
</span><span class="lines">@@ -572,17 +572,12 @@
</span><span class="cx"> send(Messages::WebResourceLoader::DidReceiveResponse(entry->response(), needsContinueDidReceiveResponseMessage));
</span><span class="cx">
</span><span class="cx"> if (entry->sourceStorageRecord().bodyHash && !m_parameters.derivedCachedDataTypesToRetrieve.isEmpty()) {
</span><del>-#if ENABLE(CACHE_PARTITIONING)
- String partition = originalRequest().cachePartition();
-#else
- String partition;
-#endif
</del><span class="cx"> auto bodyHash = *entry->sourceStorageRecord().bodyHash;
</span><span class="cx"> auto* entryPtr = entry.release();
</span><span class="cx"> auto retrieveCount = m_parameters.derivedCachedDataTypesToRetrieve.size();
</span><span class="cx">
</span><span class="cx"> for (auto& type : m_parameters.derivedCachedDataTypesToRetrieve) {
</span><del>- NetworkCache::DataKey key { partition, type, bodyHash };
</del><ins>+ NetworkCache::DataKey key { originalRequest().cachePartition(), type, bodyHash };
</ins><span class="cx"> NetworkCache::singleton().retrieveData(key, [loader = makeRef(*this), entryPtr, type, retrieveCount] (const uint8_t* data, size_t size) mutable {
</span><span class="cx"> loader->m_retrievedDerivedDataCount++;
</span><span class="cx"> bool retrievedAll = loader->m_retrievedDerivedDataCount == retrieveCount;
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp (211945 => 211946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp 2017-02-09 10:41:16 UTC (rev 211945)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp 2017-02-09 11:09:28 UTC (rev 211946)
</span><span class="lines">@@ -116,16 +116,10 @@
</span><span class="cx">
</span><span class="cx"> Key Cache::makeCacheKey(const WebCore::ResourceRequest& request)
</span><span class="cx"> {
</span><del>-#if ENABLE(CACHE_PARTITIONING)
- String partition = request.cachePartition();
-#else
- String partition;
-#endif
-
</del><span class="cx"> // FIXME: This implements minimal Range header disk cache support. We don't parse
</span><span class="cx"> // ranges so only the same exact range request will be served from the cache.
</span><span class="cx"> String range = request.httpHeaderField(WebCore::HTTPHeaderName::Range);
</span><del>- return { partition, resourceType(), range, request.url().string(), m_storage->salt() };
</del><ins>+ return { request.cachePartition(), resourceType(), range, request.url().string(), m_storage->salt() };
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static bool cachePolicyAllowsExpired(WebCore::ResourceRequestCachePolicy policy)
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheSpeculativeLoadManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoadManager.cpp (211945 => 211946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoadManager.cpp 2017-02-09 10:41:16 UTC (rev 211945)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoadManager.cpp 2017-02-09 11:09:28 UTC (rev 211946)
</span><span class="lines">@@ -89,12 +89,10 @@
</span><span class="cx"> ResourceRequest revalidationRequest(key.identifier());
</span><span class="cx"> revalidationRequest.setHTTPHeaderFields(subResourceInfo.requestHeaders());
</span><span class="cx"> revalidationRequest.setFirstPartyForCookies(subResourceInfo.firstPartyForCookies());
</span><del>-#if ENABLE(CACHE_PARTITIONING)
</del><span class="cx"> if (!key.partition().isEmpty())
</span><span class="cx"> revalidationRequest.setCachePartition(key.partition());
</span><del>-#endif
</del><span class="cx"> ASSERT_WITH_MESSAGE(key.range().isEmpty(), "range is not supported");
</span><del>-
</del><ins>+
</ins><span class="cx"> revalidationRequest.makeUnconditional();
</span><span class="cx"> if (entry) {
</span><span class="cx"> String eTag = entry->response().httpHeaderField(HTTPHeaderName::ETag);
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebCoreArgumentCoderscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp (211945 => 211946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp 2017-02-09 10:41:16 UTC (rev 211945)
+++ trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp 2017-02-09 11:09:28 UTC (rev 211946)
</span><span class="lines">@@ -979,10 +979,7 @@
</span><span class="cx">
</span><span class="cx"> void ArgumentCoder<ResourceRequest>::encode(Encoder& encoder, const ResourceRequest& resourceRequest)
</span><span class="cx"> {
</span><del>-#if ENABLE(CACHE_PARTITIONING)
</del><span class="cx"> encoder << resourceRequest.cachePartition();
</span><del>-#endif
-
</del><span class="cx"> encoder << resourceRequest.hiddenFromInspector();
</span><span class="cx">
</span><span class="cx"> if (resourceRequest.encodingRequiresPlatformData()) {
</span><span class="lines">@@ -996,12 +993,10 @@
</span><span class="cx">
</span><span class="cx"> bool ArgumentCoder<ResourceRequest>::decode(Decoder& decoder, ResourceRequest& resourceRequest)
</span><span class="cx"> {
</span><del>-#if ENABLE(CACHE_PARTITIONING)
</del><span class="cx"> String cachePartition;
</span><span class="cx"> if (!decoder.decode(cachePartition))
</span><span class="cx"> return false;
</span><span class="cx"> resourceRequest.setCachePartition(cachePartition);
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> bool isHiddenFromInspector;
</span><span class="cx"> if (!decoder.decode(isHiddenFromInspector))
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebProcessCreationParameterscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp (211945 => 211946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp 2017-02-09 10:41:16 UTC (rev 211945)
+++ trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp 2017-02-09 11:09:28 UTC (rev 211946)
</span><span class="lines">@@ -91,9 +91,7 @@
</span><span class="cx"> encoder << urlSchemesRegisteredAsDisplayIsolated;
</span><span class="cx"> encoder << urlSchemesRegisteredAsCORSEnabled;
</span><span class="cx"> encoder << urlSchemesRegisteredAsAlwaysRevalidated;
</span><del>-#if ENABLE(CACHE_PARTITIONING)
</del><span class="cx"> encoder << urlSchemesRegisteredAsCachePartitioned;
</span><del>-#endif
</del><span class="cx"> encoder.encodeEnum(cacheModel);
</span><span class="cx"> encoder << shouldAlwaysUseComplexTextCodePath;
</span><span class="cx"> encoder << shouldEnableMemoryPressureReliefLogging;
</span><span class="lines">@@ -221,10 +219,8 @@
</span><span class="cx"> return false;
</span><span class="cx"> if (!decoder.decode(parameters.urlSchemesRegisteredAsAlwaysRevalidated))
</span><span class="cx"> return false;
</span><del>-#if ENABLE(CACHE_PARTITIONING)
</del><span class="cx"> if (!decoder.decode(parameters.urlSchemesRegisteredAsCachePartitioned))
</span><span class="cx"> return false;
</span><del>-#endif
</del><span class="cx"> if (!decoder.decodeEnum(parameters.cacheModel))
</span><span class="cx"> return false;
</span><span class="cx"> if (!decoder.decode(parameters.shouldAlwaysUseComplexTextCodePath))
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebProcessCreationParametersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h (211945 => 211946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h 2017-02-09 10:41:16 UTC (rev 211945)
+++ trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h 2017-02-09 11:09:28 UTC (rev 211946)
</span><span class="lines">@@ -100,9 +100,7 @@
</span><span class="cx"> Vector<String> urlSchemesRegisteredAsDisplayIsolated;
</span><span class="cx"> Vector<String> urlSchemesRegisteredAsCORSEnabled;
</span><span class="cx"> Vector<String> urlSchemesRegisteredAsAlwaysRevalidated;
</span><del>-#if ENABLE(CACHE_PARTITIONING)
</del><span class="cx"> Vector<String> urlSchemesRegisteredAsCachePartitioned;
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> CacheModel cacheModel;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp (211945 => 211946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp 2017-02-09 10:41:16 UTC (rev 211945)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp 2017-02-09 11:09:28 UTC (rev 211946)
</span><span class="lines">@@ -379,12 +379,7 @@
</span><span class="cx">
</span><span class="cx"> void WKContextRegisterURLSchemeAsCachePartitioned(WKContextRef contextRef, WKStringRef urlScheme)
</span><span class="cx"> {
</span><del>-#if ENABLE(CACHE_PARTITIONING)
</del><span class="cx"> toImpl(contextRef)->registerURLSchemeAsCachePartitioned(toImpl(urlScheme)->string());
</span><del>-#else
- UNUSED_PARAM(contextRef);
- UNUSED_PARAM(urlScheme);
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WKContextSetDomainRelaxationForbiddenForURLScheme(WKContextRef contextRef, WKStringRef urlScheme)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessPoolcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp (211945 => 211946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp 2017-02-09 10:41:16 UTC (rev 211945)
+++ trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp 2017-02-09 11:09:28 UTC (rev 211946)
</span><span class="lines">@@ -187,10 +187,8 @@
</span><span class="cx"> for (auto& scheme : m_configuration->alwaysRevalidatedURLSchemes())
</span><span class="cx"> m_schemesToRegisterAsAlwaysRevalidated.add(scheme);
</span><span class="cx">
</span><del>-#if ENABLE(CACHE_PARTITIONING)
</del><span class="cx"> for (const auto& urlScheme : m_configuration->cachePartitionedURLSchemes())
</span><span class="cx"> m_schemesToRegisterAsCachePartitioned.add(urlScheme);
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> platformInitialize();
</span><span class="cx">
</span><span class="lines">@@ -596,9 +594,7 @@
</span><span class="cx"> copyToVector(m_schemesToRegisterAsDisplayIsolated, parameters.urlSchemesRegisteredAsDisplayIsolated);
</span><span class="cx"> copyToVector(m_schemesToRegisterAsCORSEnabled, parameters.urlSchemesRegisteredAsCORSEnabled);
</span><span class="cx"> copyToVector(m_schemesToRegisterAsAlwaysRevalidated, parameters.urlSchemesRegisteredAsAlwaysRevalidated);
</span><del>-#if ENABLE(CACHE_PARTITIONING)
</del><span class="cx"> copyToVector(m_schemesToRegisterAsCachePartitioned, parameters.urlSchemesRegisteredAsCachePartitioned);
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> parameters.shouldAlwaysUseComplexTextCodePath = m_alwaysUsesComplexTextCodePath;
</span><span class="cx"> parameters.shouldUseFontSmoothing = m_shouldUseFontSmoothing;
</span><span class="lines">@@ -1004,13 +1000,11 @@
</span><span class="cx"> processPool->unregisterSchemeForCustomProtocol(urlScheme);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(CACHE_PARTITIONING)
</del><span class="cx"> void WebProcessPool::registerURLSchemeAsCachePartitioned(const String& urlScheme)
</span><span class="cx"> {
</span><span class="cx"> m_schemesToRegisterAsCachePartitioned.add(urlScheme);
</span><span class="cx"> sendToAllProcesses(Messages::WebProcess::RegisterURLSchemeAsCachePartitioned(urlScheme));
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> void WebProcessPool::setCacheModel(CacheModel cacheModel)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessPoolh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessPool.h (211945 => 211946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessPool.h 2017-02-09 10:41:16 UTC (rev 211945)
+++ trunk/Source/WebKit2/UIProcess/WebProcessPool.h 2017-02-09 11:09:28 UTC (rev 211946)
</span><span class="lines">@@ -210,9 +210,7 @@
</span><span class="cx"> void registerURLSchemeAsNoAccess(const String&);
</span><span class="cx"> void registerURLSchemeAsDisplayIsolated(const String&);
</span><span class="cx"> void registerURLSchemeAsCORSEnabled(const String&);
</span><del>-#if ENABLE(CACHE_PARTITIONING)
</del><span class="cx"> void registerURLSchemeAsCachePartitioned(const String&);
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> VisitedLinkStore& visitedLinkStore() { return m_visitedLinkStore.get(); }
</span><span class="cx">
</span><span class="lines">@@ -499,9 +497,7 @@
</span><span class="cx"> HashSet<String> m_schemesToRegisterAsDisplayIsolated;
</span><span class="cx"> HashSet<String> m_schemesToRegisterAsCORSEnabled;
</span><span class="cx"> HashSet<String> m_schemesToRegisterAsAlwaysRevalidated;
</span><del>-#if ENABLE(CACHE_PARTITIONING)
</del><span class="cx"> HashSet<String> m_schemesToRegisterAsCachePartitioned;
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> bool m_alwaysUsesComplexTextCodePath;
</span><span class="cx"> bool m_shouldUseFontSmoothing;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsPluginViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp (211945 => 211946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp 2017-02-09 10:41:16 UTC (rev 211945)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp 2017-02-09 11:09:28 UTC (rev 211946)
</span><span class="lines">@@ -1589,11 +1589,7 @@
</span><span class="cx">
</span><span class="cx"> bool PluginView::getAuthenticationInfo(const ProtectionSpace& protectionSpace, String& username, String& password)
</span><span class="cx"> {
</span><del>-#if ENABLE(CACHE_PARTITIONING)
</del><span class="cx"> String partitionName = m_pluginElement->contentDocument()->topDocument().securityOrigin().domainForCachePartition();
</span><del>-#else
- String partitionName = emptyString();
-#endif
</del><span class="cx"> Credential credential = CredentialStorage::defaultCredentialStorage().get(partitionName, protectionSpace);
</span><span class="cx"> if (credential.isEmpty())
</span><span class="cx"> credential = CredentialStorage::defaultCredentialStorage().getFromPersistentStorage(protectionSpace);
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportmacWebSystemInterfacemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm (211945 => 211946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm 2017-02-09 10:41:16 UTC (rev 211945)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm 2017-02-09 11:09:28 UTC (rev 211946)
</span><span class="lines">@@ -111,9 +111,7 @@
</span><span class="cx"> INIT(IsPublicSuffix);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(CACHE_PARTITIONING)
</del><span class="cx"> INIT(CachePartitionKey);
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> INIT(ExernalDeviceTypeForPlayer);
</span><span class="cx"> INIT(ExernalDeviceDisplayNameForPlayer);
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebProcess.cpp (211945 => 211946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2017-02-09 10:41:16 UTC (rev 211945)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2017-02-09 11:09:28 UTC (rev 211946)
</span><span class="lines">@@ -337,10 +337,8 @@
</span><span class="cx"> for (auto& scheme : parameters.urlSchemesRegisteredAsAlwaysRevalidated)
</span><span class="cx"> registerURLSchemeAsAlwaysRevalidated(scheme);
</span><span class="cx">
</span><del>-#if ENABLE(CACHE_PARTITIONING)
</del><span class="cx"> for (auto& scheme : parameters.urlSchemesRegisteredAsCachePartitioned)
</span><span class="cx"> registerURLSchemeAsCachePartitioned(scheme);
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> setDefaultRequestTimeoutInterval(parameters.defaultRequestTimeoutInterval);
</span><span class="cx">
</span><span class="lines">@@ -462,12 +460,10 @@
</span><span class="cx"> SchemeRegistry::registerURLSchemeAsAlwaysRevalidated(urlScheme);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(CACHE_PARTITIONING)
</del><span class="cx"> void WebProcess::registerURLSchemeAsCachePartitioned(const String& urlScheme) const
</span><span class="cx"> {
</span><span class="cx"> SchemeRegistry::registerURLSchemeAsCachePartitioned(urlScheme);
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> void WebProcess::setDefaultRequestTimeoutInterval(double timeoutInterval)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebProcessh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebProcess.h (211945 => 211946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebProcess.h 2017-02-09 10:41:16 UTC (rev 211945)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.h 2017-02-09 11:09:28 UTC (rev 211946)
</span><span class="lines">@@ -257,9 +257,7 @@
</span><span class="cx"> void registerURLSchemeAsDisplayIsolated(const String&) const;
</span><span class="cx"> void registerURLSchemeAsCORSEnabled(const String&) const;
</span><span class="cx"> void registerURLSchemeAsAlwaysRevalidated(const String&) const;
</span><del>-#if ENABLE(CACHE_PARTITIONING)
</del><span class="cx"> void registerURLSchemeAsCachePartitioned(const String&) const;
</span><del>-#endif
</del><span class="cx"> void setDefaultRequestTimeoutInterval(double);
</span><span class="cx"> void setAlwaysUsesComplexTextCodePath(bool);
</span><span class="cx"> void setShouldUseFontSmoothing(bool);
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebProcessmessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebProcess.messages.in (211945 => 211946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebProcess.messages.in 2017-02-09 10:41:16 UTC (rev 211945)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.messages.in 2017-02-09 11:09:28 UTC (rev 211946)
</span><span class="lines">@@ -36,9 +36,7 @@
</span><span class="cx"> RegisterURLSchemeAsNoAccess(String scheme)
</span><span class="cx"> RegisterURLSchemeAsDisplayIsolated(String scheme)
</span><span class="cx"> RegisterURLSchemeAsCORSEnabled(String scheme)
</span><del>-#if ENABLE(CACHE_PARTITIONING)
</del><span class="cx"> RegisterURLSchemeAsCachePartitioned(String scheme)
</span><del>-#endif
</del><span class="cx"> SetDefaultRequestTimeoutInterval(double timeoutInterval)
</span><span class="cx"> SetAlwaysUsesComplexTextCodePath(bool alwaysUseComplexText)
</span><span class="cx"> SetShouldUseFontSmoothing(bool useFontSmoothing)
</span></span></pre>
</div>
</div>
</body>
</html>