<!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>[180706] 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/180706">180706</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2015-02-26 15:34:16 -0800 (Thu, 26 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add API to remove all website data for the given data records
https://bugs.webkit.org/show_bug.cgi?id=142060
Reviewed by Beth Dakin.
Source/WebCore:
* loader/cache/MemoryCache.cpp:
(WebCore::MemoryCache::removeResourcesWithOrigins):
New function that removes all resources that match the set of origins in a given session.
Source/WebKit2:
* UIProcess/API/Cocoa/_WKWebsiteDataStore.h:
Add new method declaration.
* UIProcess/API/Cocoa/_WKWebsiteDataStore.mm:
(toWebsiteDataRecords):
Add a helper function that converts an NSArray of _WKWebsiteDataRecords to a Vector of WebsiteDataRecords.
(-[_WKWebsiteDataStore removeDataOfTypes:forDataRecords:completionHandler:]):
Call through to the underlying WebsiteDataStore.
* UIProcess/WebsiteData/WebsiteDataStore.cpp:
(WebKit::WebsiteDataStore::removeData):
Figure out which processes to call deleteWebsiteDataForOrigins for and do so. Add a callback aggregator so we can
call the completion handler at the right time.
* UIProcess/WebsiteData/WebsiteDataStore.h:
Add new members.
* WebProcess/WebProcess.cpp:
(WebKit::WebProcess::deleteWebsiteDataForOrigins):
Use the newly added MemoryCache member function to delete all resources matching the set of origins.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreloadercacheMemoryCachecpp">trunk/Source/WebCore/loader/cache/MemoryCache.cpp</a></li>
<li><a href="#trunkSourceWebCoreloadercacheMemoryCacheh">trunk/Source/WebCore/loader/cache/MemoryCache.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoa_WKWebsiteDataStoreh">trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataStore.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoa_WKWebsiteDataStoremm">trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataStore.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebsiteDataWebsiteDataStorecpp">trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebsiteDataWebsiteDataStoreh">trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebProcesscpp">trunk/Source/WebKit2/WebProcess/WebProcess.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (180705 => 180706)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-02-26 23:26:03 UTC (rev 180705)
+++ trunk/Source/WebCore/ChangeLog 2015-02-26 23:34:16 UTC (rev 180706)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-02-26 Anders Carlsson <andersca@apple.com>
+
+ Add API to remove all website data for the given data records
+ https://bugs.webkit.org/show_bug.cgi?id=142060
+
+ Reviewed by Beth Dakin.
+
+ * loader/cache/MemoryCache.cpp:
+ (WebCore::MemoryCache::removeResourcesWithOrigins):
+ New function that removes all resources that match the set of origins in a given session.
+
</ins><span class="cx"> 2015-02-26 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Rename DatabaseManager::manager() to DatabaseManager::singleton()
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheMemoryCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/MemoryCache.cpp (180705 => 180706)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/MemoryCache.cpp 2015-02-26 23:26:03 UTC (rev 180705)
+++ trunk/Source/WebCore/loader/cache/MemoryCache.cpp 2015-02-26 23:34:16 UTC (rev 180706)
</span><span class="lines">@@ -543,6 +543,39 @@
</span><span class="cx"> remove(*resource);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void MemoryCache::removeResourcesWithOrigins(SessionID sessionID, const HashSet<RefPtr<SecurityOrigin>>& origins)
+{
+ auto* resourceMap = sessionResourceMap(sessionID);
+ if (!resourceMap)
+ return;
+
+#if ENABLE(CACHE_PARTITIONING)
+ HashSet<String> originPartitions;
+
+ for (auto& origin : origins)
+ originPartitions.add(ResourceRequest::partitionName(origin->host()));
+#endif
+
+ Vector<CachedResource*> resourcesToRemove;
+ for (auto& keyValuePair : *resourceMap) {
+ auto& resource = *keyValuePair.value;
+
+#if ENABLE(CACHE_PARTITIONING)
+ auto& partitionName = keyValuePair.key.second;
+ if (originPartitions.contains(partitionName)) {
+ resourcesToRemove.append(&resource);
+ continue;
+ }
+#endif
+
+ if (origins.contains(SecurityOrigin::create(resource.url()).ptr()))
+ resourcesToRemove.append(&resource);
+ }
+
+ for (auto& resource : resourcesToRemove)
+ remove(*resource);
+}
+
</ins><span class="cx"> void MemoryCache::getOriginsWithCache(SecurityOriginSet& origins)
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(CACHE_PARTITIONING)
</span><span class="lines">@@ -568,7 +601,6 @@
</span><span class="cx">
</span><span class="cx"> auto it = m_sessionResources.find(sessionID);
</span><span class="cx"> if (it != m_sessionResources.end()) {
</span><del>-
</del><span class="cx"> for (auto& keyValue : *it->value) {
</span><span class="cx"> auto& resource = *keyValue.value;
</span><span class="cx"> #if ENABLE(CACHE_PARTITIONING)
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheMemoryCacheh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/MemoryCache.h (180705 => 180706)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/MemoryCache.h 2015-02-26 23:26:03 UTC (rev 180705)
+++ trunk/Source/WebCore/loader/cache/MemoryCache.h 2015-02-26 23:34:16 UTC (rev 180706)
</span><span class="lines">@@ -147,6 +147,7 @@
</span><span class="cx">
</span><span class="cx"> typedef HashSet<RefPtr<SecurityOrigin>> SecurityOriginSet;
</span><span class="cx"> WEBCORE_EXPORT void removeResourcesWithOrigin(SecurityOrigin&);
</span><ins>+ WEBCORE_EXPORT void removeResourcesWithOrigins(SessionID, const HashSet<RefPtr<SecurityOrigin>>&);
</ins><span class="cx"> WEBCORE_EXPORT void getOriginsWithCache(SecurityOriginSet& origins);
</span><span class="cx"> WEBCORE_EXPORT HashSet<RefPtr<SecurityOrigin>> originsWithCache(SessionID) const;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (180705 => 180706)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-02-26 23:26:03 UTC (rev 180705)
+++ trunk/Source/WebKit2/ChangeLog 2015-02-26 23:34:16 UTC (rev 180706)
</span><span class="lines">@@ -1,3 +1,32 @@
</span><ins>+2015-02-26 Anders Carlsson <andersca@apple.com>
+
+ Add API to remove all website data for the given data records
+ https://bugs.webkit.org/show_bug.cgi?id=142060
+
+ Reviewed by Beth Dakin.
+
+ * UIProcess/API/Cocoa/_WKWebsiteDataStore.h:
+ Add new method declaration.
+
+ * UIProcess/API/Cocoa/_WKWebsiteDataStore.mm:
+ (toWebsiteDataRecords):
+ Add a helper function that converts an NSArray of _WKWebsiteDataRecords to a Vector of WebsiteDataRecords.
+
+ (-[_WKWebsiteDataStore removeDataOfTypes:forDataRecords:completionHandler:]):
+ Call through to the underlying WebsiteDataStore.
+
+ * UIProcess/WebsiteData/WebsiteDataStore.cpp:
+ (WebKit::WebsiteDataStore::removeData):
+ Figure out which processes to call deleteWebsiteDataForOrigins for and do so. Add a callback aggregator so we can
+ call the completion handler at the right time.
+
+ * UIProcess/WebsiteData/WebsiteDataStore.h:
+ Add new members.
+
+ * WebProcess/WebProcess.cpp:
+ (WebKit::WebProcess::deleteWebsiteDataForOrigins):
+ Use the newly added MemoryCache member function to delete all resources matching the set of origins.
+
</ins><span class="cx"> 2015-02-26 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Rename DatabaseManager::manager() to DatabaseManager::singleton()
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoa_WKWebsiteDataStoreh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataStore.h (180705 => 180706)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataStore.h 2015-02-26 23:26:03 UTC (rev 180705)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataStore.h 2015-02-26 23:34:16 UTC (rev 180706)
</span><span class="lines">@@ -40,7 +40,8 @@
</span><span class="cx">
</span><span class="cx"> @property (readonly, getter=isNonPersistent) BOOL nonPersistent;
</span><span class="cx">
</span><del>-- (void)fetchDataRecordsOfTypes:(WKWebsiteDataTypes)websiteDataTypes completionHandler:(void (^)(NSArray *))completionHandler;
</del><ins>+- (void)fetchDataRecordsOfTypes:(WKWebsiteDataTypes)websiteDataTypes completionHandler:(void (^)(NSArray *))completionHandler WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
+- (void)removeDataOfTypes:(WKWebsiteDataTypes)websiteDataTypes forDataRecords:(NSArray *)dataRecords completionHandler:(void (^)())completionHandler WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
</ins><span class="cx"> - (void)removeDataOfTypes:(WKWebsiteDataTypes)websiteDataTypes modifiedSince:(NSDate *)date completionHandler:(void (^)())completionHandler WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
</span><span class="cx">
</span><span class="cx"> @end
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoa_WKWebsiteDataStoremm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataStore.mm (180705 => 180706)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataStore.mm 2015-02-26 23:26:03 UTC (rev 180705)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataStore.mm 2015-02-26 23:34:16 UTC (rev 180706)
</span><span class="lines">@@ -90,6 +90,26 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static Vector<WebKit::WebsiteDataRecord> toWebsiteDataRecords(NSArray *dataRecords)
+{
+ Vector<WebKit::WebsiteDataRecord> result;
+
+ for (_WKWebsiteDataRecord *dataRecord in dataRecords)
+ result.append(dataRecord->_websiteDataRecord->websiteDataRecord());
+
+ return result;
+}
+
+- (void)removeDataOfTypes:(WKWebsiteDataTypes)websiteDataTypes forDataRecords:(NSArray *)dataRecords completionHandler:(void (^)())completionHandler
+{
+ auto completionHandlerCopy = Block_copy(completionHandler);
+
+ _websiteDataStore->websiteDataStore().removeData(WebKit::toWebsiteDataTypes(websiteDataTypes), toWebsiteDataRecords(dataRecords), [completionHandlerCopy] {
+ completionHandlerCopy();
+ Block_release(completionHandlerCopy);
+ });
+}
+
</ins><span class="cx"> #pragma mark WKObject protocol implementation
</span><span class="cx">
</span><span class="cx"> - (API::Object&)_apiObject
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebsiteDataWebsiteDataStorecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp (180705 => 180706)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp 2015-02-26 23:26:03 UTC (rev 180705)
+++ trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp 2015-02-26 23:34:16 UTC (rev 180706)
</span><span class="lines">@@ -233,7 +233,6 @@
</span><span class="cx"> return processAccessType;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-
</del><span class="cx"> void WebsiteDataStore::removeData(WebsiteDataTypes dataTypes, std::chrono::system_clock::time_point modifiedSince, std::function<void ()> completionHandler)
</span><span class="cx"> {
</span><span class="cx"> struct CallbackAggregator : public RefCounted<CallbackAggregator> {
</span><span class="lines">@@ -332,6 +331,75 @@
</span><span class="cx"> callbackAggregator->callIfNeeded();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebsiteDataStore::removeData(WebsiteDataTypes dataTypes, const Vector<WebsiteDataRecord>& dataRecords, std::function<void ()> completionHandler)
+{
+ struct CallbackAggregator : public RefCounted<CallbackAggregator> {
+ explicit CallbackAggregator (std::function<void ()> completionHandler)
+ : completionHandler(WTF::move(completionHandler))
+ {
+ }
+
+ void addPendingCallback()
+ {
+ pendingCallbacks++;
+ }
+
+ void removePendingCallback()
+ {
+ ASSERT(pendingCallbacks);
+ --pendingCallbacks;
+
+ callIfNeeded();
+ }
+
+ void callIfNeeded()
+ {
+ if (!pendingCallbacks)
+ RunLoop::main().dispatch(WTF::move(completionHandler));
+ }
+
+ unsigned pendingCallbacks = 0;
+ std::function<void ()> completionHandler;
+ };
+
+ RefPtr<CallbackAggregator> callbackAggregator = adoptRef(new CallbackAggregator(WTF::move(completionHandler)));
+
+ auto webProcessAccessType = computeWebProcessAccessTypeForDataRemoval(dataTypes, isNonPersistent());
+ if (webProcessAccessType != ProcessAccessType::None) {
+ for (auto& process : processes()) {
+ switch (webProcessAccessType) {
+ case ProcessAccessType::OnlyIfLaunched:
+ if (!process->canSendMessage())
+ continue;
+ break;
+
+ case ProcessAccessType::Launch:
+ // FIXME: Handle this.
+ ASSERT_NOT_REACHED();
+ break;
+
+ case ProcessAccessType::None:
+ ASSERT_NOT_REACHED();
+ }
+
+ callbackAggregator->addPendingCallback();
+ Vector<RefPtr<WebCore::SecurityOrigin>> origins;
+
+ for (const auto& dataRecord : dataRecords) {
+ for (auto& origin : dataRecord.origins)
+ origins.append(origin);
+ }
+
+ process->deleteWebsiteDataForOrigins(m_sessionID, dataTypes, origins, [callbackAggregator] {
+ callbackAggregator->removePendingCallback();
+ });
+ }
+ }
+
+ // There's a chance that we don't have any pending callbacks. If so, we want to dispatch the completion handler right away.
+ callbackAggregator->callIfNeeded();
+}
+
</ins><span class="cx"> void WebsiteDataStore::webPageWasAdded(WebPageProxy& webPageProxy)
</span><span class="cx"> {
</span><span class="cx"> if (m_storageManager)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebsiteDataWebsiteDataStoreh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.h (180705 => 180706)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.h 2015-02-26 23:26:03 UTC (rev 180705)
+++ trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.h 2015-02-26 23:34:16 UTC (rev 180706)
</span><span class="lines">@@ -59,6 +59,7 @@
</span><span class="cx">
</span><span class="cx"> void fetchData(WebsiteDataTypes, std::function<void (Vector<WebsiteDataRecord>)> completionHandler);
</span><span class="cx"> void removeData(WebsiteDataTypes, std::chrono::system_clock::time_point modifiedSince, std::function<void ()> completionHandler);
</span><ins>+ void removeData(WebsiteDataTypes, const Vector<WebsiteDataRecord>&, std::function<void ()> completionHandler);
</ins><span class="cx">
</span><span class="cx"> StorageManager* storageManager() { return m_storageManager.get(); }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebProcess.cpp (180705 => 180706)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2015-02-26 23:26:03 UTC (rev 180705)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2015-02-26 23:34:16 UTC (rev 180706)
</span><span class="lines">@@ -1160,10 +1160,16 @@
</span><span class="cx"> parentProcessConnection()->send(Messages::WebProcessProxy::DidDeleteWebsiteData(callbackID), 0);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebProcess::deleteWebsiteDataForOrigins(WebCore::SessionID sessionID, uint64_t websiteDataTypes, const Vector<WebKit::SecurityOriginData>& origins, uint64_t callbackID)
</del><ins>+void WebProcess::deleteWebsiteDataForOrigins(WebCore::SessionID sessionID, uint64_t websiteDataTypes, const Vector<WebKit::SecurityOriginData>& originDatas, uint64_t callbackID)
</ins><span class="cx"> {
</span><del>- // FIXME: Actually delete something here.
</del><ins>+ if (websiteDataTypes & WebsiteDataTypeMemoryCache) {
+ HashSet<RefPtr<SecurityOrigin>> origins;
+ for (auto& originData : originDatas)
+ origins.add(originData.securityOrigin());
</ins><span class="cx">
</span><ins>+ MemoryCache::singleton().removeResourcesWithOrigins(sessionID, origins);
+ }
+
</ins><span class="cx"> parentProcessConnection()->send(Messages::WebProcessProxy::DidDeleteWebsiteDataForOrigins(callbackID), 0);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>