<!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>[197203] trunk</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/197203">197203</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2016-02-26 14:26:03 -0800 (Fri, 26 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>WKWebsiteDataStore/WKWebsiteDataRecord needs to provide size information about each type of data
https://bugs.webkit.org/show_bug.cgi?id=154750
Source/WebKit2:
Reviewed by Tim Horton.
* DatabaseProcess/DatabaseProcess.cpp:
(WebKit::DatabaseProcess::fetchWebsiteData):
WebsiteData::Entry now takes a size.
* NetworkProcess/NetworkProcess.cpp:
(WebKit::fetchDiskCacheEntries):
If necessary, compute sizes.
(WebKit::NetworkProcess::fetchWebsiteData):
Just pass 0 for the CF cache for now.
* NetworkProcess/NetworkProcess.h:
* NetworkProcess/NetworkProcess.messages.in:
FetchWebsiteData now takes a OptionSet<WebsiteDataFetchOption>.
* Shared/WebsiteData/WebsiteData.cpp:
(WebKit::WebsiteData::Entry::encode):
(WebKit::WebsiteData::Entry::decode):
Encode and decode the size.
* Shared/WebsiteData/WebsiteData.h:
Add size.
* Shared/WebsiteData/WebsiteDataFetchOption.h:
Add new enum.
* UIProcess/API/C/WKApplicationCacheManager.cpp:
(WKApplicationCacheManagerGetApplicationCacheOrigins):
Pass an empty OptionSet<WebsiteDataFetchOption>.
* UIProcess/API/C/WKResourceCacheManager.cpp:
(WKResourceCacheManagerGetCacheOrigins):
Pass an empty OptionSet<WebsiteDataFetchOption>.
* UIProcess/API/Cocoa/WKWebsiteDataRecord.mm:
(-[WKWebsiteDataRecord description]):
If we have a size, print it out as well.
(-[WKWebsiteDataRecord _dataSize]):
Return a size if we have one.
* UIProcess/API/Cocoa/WKWebsiteDataRecordPrivate.h:
* UIProcess/API/Cocoa/WKWebsiteDataStore.mm:
(-[WKWebsiteDataStore fetchDataRecordsOfTypes:completionHandler:]):
Call through to the SPI.
(-[WKWebsiteDataStore _fetchDataRecordsOfTypes:withOptions:completionHandler:]):
Compute the right options.
* UIProcess/API/Cocoa/WKWebsiteDataStoreInternal.h:
Import WKWebsiteDataStorePrivate.h.
* UIProcess/API/Cocoa/WKWebsiteDataStorePrivate.h:
Add SPI.
* UIProcess/API/Cocoa/_WKWebsiteDataSize.h:
* UIProcess/API/Cocoa/_WKWebsiteDataSize.mm:
(-[_WKWebsiteDataSize initWithSize:]):
(-[_WKWebsiteDataSize totalSize]):
(-[_WKWebsiteDataSize sizeOfDataTypes:]):
Add _WKWebsiteDataSize header.
* UIProcess/API/Cocoa/_WKWebsiteDataSizeInternal.h: Add IPI header.
* UIProcess/Network/NetworkProcessProxy.cpp:
(WebKit::NetworkProcessProxy::fetchWebsiteData):
This now takes a OptionSet<WebsiteDataFetchOption>.
* UIProcess/Network/NetworkProcessProxy.h:
Update members.
* UIProcess/WebsiteData/WebsiteDataRecord.h:
Add a hash map from types to sizes.
* UIProcess/WebsiteData/WebsiteDataStore.cpp:
(WebKit::WebsiteDataStore::fetchData):
This now takes a OptionSet<WebsiteDataFetchOption>.
* UIProcess/WebsiteData/WebsiteDataStore.h:
Update member functions.
* WebKit2.xcodeproj/project.pbxproj:
Add new files.
* WebProcess/WebProcess.cpp:
(WebKit::WebProcess::fetchWebsiteData):
This now takes a OptionSet<WebsiteDataFetchOption>.
Tools:
rdar://problem/23861395
Reviewed by Tim Horton.
* MiniBrowser/mac/WK2BrowserWindowController.m:
(-[WK2BrowserWindowController fetchWebsiteData:]):
Use the new WKWebsiteDataStore SPI to compute data sizes.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2DatabaseProcessDatabaseProcesscpp">trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkProcesscpp">trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkProcessh">trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkProcessmessagesin">trunk/Source/WebKit2/NetworkProcess/NetworkProcess.messages.in</a></li>
<li><a href="#trunkSourceWebKit2SharedWebsiteDataWebsiteDatacpp">trunk/Source/WebKit2/Shared/WebsiteData/WebsiteData.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedWebsiteDataWebsiteDatah">trunk/Source/WebKit2/Shared/WebsiteData/WebsiteData.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKApplicationCacheManagercpp">trunk/Source/WebKit2/UIProcess/API/C/WKApplicationCacheManager.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKResourceCacheManagercpp">trunk/Source/WebKit2/UIProcess/API/C/WKResourceCacheManager.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebsiteDataRecordmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataRecord.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebsiteDataRecordPrivateh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataRecordPrivate.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebsiteDataStoremm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataStore.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebsiteDataStoreInternalh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataStoreInternal.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessNetworkNetworkProcessProxycpp">trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessNetworkNetworkProcessProxyh">trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebsiteDataWebsiteDataRecordh">trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataRecord.h</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="#trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj">trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebProcesscpp">trunk/Source/WebKit2/WebProcess/WebProcess.cpp</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsMiniBrowsermacWK2BrowserWindowControllerm">trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2SharedWebsiteDataWebsiteDataFetchOptionh">trunk/Source/WebKit2/Shared/WebsiteData/WebsiteDataFetchOption.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebsiteDataStorePrivateh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataStorePrivate.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoa_WKWebsiteDataSizeh">trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataSize.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoa_WKWebsiteDataSizemm">trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataSize.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoa_WKWebsiteDataSizeInternalh">trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataSizeInternal.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (197202 => 197203)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-02-26 22:24:29 UTC (rev 197202)
+++ trunk/Source/WebKit2/ChangeLog 2016-02-26 22:26:03 UTC (rev 197203)
</span><span class="lines">@@ -1,5 +1,100 @@
</span><span class="cx"> 2016-02-26 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><ins>+ WKWebsiteDataStore/WKWebsiteDataRecord needs to provide size information about each type of data
+ https://bugs.webkit.org/show_bug.cgi?id=154750
+
+ Reviewed by Tim Horton.
+
+ * DatabaseProcess/DatabaseProcess.cpp:
+ (WebKit::DatabaseProcess::fetchWebsiteData):
+ WebsiteData::Entry now takes a size.
+
+ * NetworkProcess/NetworkProcess.cpp:
+ (WebKit::fetchDiskCacheEntries):
+ If necessary, compute sizes.
+
+ (WebKit::NetworkProcess::fetchWebsiteData):
+ Just pass 0 for the CF cache for now.
+
+ * NetworkProcess/NetworkProcess.h:
+ * NetworkProcess/NetworkProcess.messages.in:
+ FetchWebsiteData now takes a OptionSet<WebsiteDataFetchOption>.
+
+ * Shared/WebsiteData/WebsiteData.cpp:
+ (WebKit::WebsiteData::Entry::encode):
+ (WebKit::WebsiteData::Entry::decode):
+ Encode and decode the size.
+
+ * Shared/WebsiteData/WebsiteData.h:
+ Add size.
+
+ * Shared/WebsiteData/WebsiteDataFetchOption.h:
+ Add new enum.
+
+ * UIProcess/API/C/WKApplicationCacheManager.cpp:
+ (WKApplicationCacheManagerGetApplicationCacheOrigins):
+ Pass an empty OptionSet<WebsiteDataFetchOption>.
+
+ * UIProcess/API/C/WKResourceCacheManager.cpp:
+ (WKResourceCacheManagerGetCacheOrigins):
+ Pass an empty OptionSet<WebsiteDataFetchOption>.
+
+ * UIProcess/API/Cocoa/WKWebsiteDataRecord.mm:
+ (-[WKWebsiteDataRecord description]):
+ If we have a size, print it out as well.
+
+ (-[WKWebsiteDataRecord _dataSize]):
+ Return a size if we have one.
+
+ * UIProcess/API/Cocoa/WKWebsiteDataRecordPrivate.h:
+ * UIProcess/API/Cocoa/WKWebsiteDataStore.mm:
+ (-[WKWebsiteDataStore fetchDataRecordsOfTypes:completionHandler:]):
+ Call through to the SPI.
+
+ (-[WKWebsiteDataStore _fetchDataRecordsOfTypes:withOptions:completionHandler:]):
+ Compute the right options.
+
+ * UIProcess/API/Cocoa/WKWebsiteDataStoreInternal.h:
+ Import WKWebsiteDataStorePrivate.h.
+
+ * UIProcess/API/Cocoa/WKWebsiteDataStorePrivate.h:
+ Add SPI.
+
+ * UIProcess/API/Cocoa/_WKWebsiteDataSize.h:
+ * UIProcess/API/Cocoa/_WKWebsiteDataSize.mm:
+ (-[_WKWebsiteDataSize initWithSize:]):
+ (-[_WKWebsiteDataSize totalSize]):
+ (-[_WKWebsiteDataSize sizeOfDataTypes:]):
+ Add _WKWebsiteDataSize header.
+
+ * UIProcess/API/Cocoa/_WKWebsiteDataSizeInternal.h: Add IPI header.
+
+ * UIProcess/Network/NetworkProcessProxy.cpp:
+ (WebKit::NetworkProcessProxy::fetchWebsiteData):
+ This now takes a OptionSet<WebsiteDataFetchOption>.
+
+ * UIProcess/Network/NetworkProcessProxy.h:
+ Update members.
+
+ * UIProcess/WebsiteData/WebsiteDataRecord.h:
+ Add a hash map from types to sizes.
+
+ * UIProcess/WebsiteData/WebsiteDataStore.cpp:
+ (WebKit::WebsiteDataStore::fetchData):
+ This now takes a OptionSet<WebsiteDataFetchOption>.
+
+ * UIProcess/WebsiteData/WebsiteDataStore.h:
+ Update member functions.
+
+ * WebKit2.xcodeproj/project.pbxproj:
+ Add new files.
+
+ * WebProcess/WebProcess.cpp:
+ (WebKit::WebProcess::fetchWebsiteData):
+ This now takes a OptionSet<WebsiteDataFetchOption>.
+
+2016-02-26 Anders Carlsson <andersca@apple.com>
+
</ins><span class="cx"> Add a toWebsiteDataType and reimplement toWebsiteDataTypes using it
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=154746
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2DatabaseProcessDatabaseProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.cpp (197202 => 197203)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.cpp 2016-02-26 22:24:29 UTC (rev 197202)
+++ trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.cpp 2016-02-26 22:26:03 UTC (rev 197203)
</span><span class="lines">@@ -228,7 +228,7 @@
</span><span class="cx">
</span><span class="cx"> RunLoop::main().dispatch([callbackAggregator, securityOrigins] {
</span><span class="cx"> for (const auto& securityOrigin : securityOrigins)
</span><del>- callbackAggregator->m_websiteData.entries.append(WebsiteData::Entry { securityOrigin, WebsiteDataType::IndexedDBDatabases });
</del><ins>+ callbackAggregator->m_websiteData.entries.append(WebsiteData::Entry { securityOrigin, WebsiteDataType::IndexedDBDatabases, 0 });
</ins><span class="cx"> });
</span><span class="cx"> }));
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp (197202 => 197203)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp 2016-02-26 22:24:29 UTC (rev 197202)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp 2016-02-26 22:26:03 UTC (rev 197203)
</span><span class="lines">@@ -46,6 +46,7 @@
</span><span class="cx"> #include "WebCoreArgumentCoders.h"
</span><span class="cx"> #include "WebProcessPoolMessages.h"
</span><span class="cx"> #include "WebsiteData.h"
</span><ins>+#include "WebsiteDataFetchOption.h"
</ins><span class="cx"> #include "WebsiteDataType.h"
</span><span class="cx"> #include <WebCore/DNS.h>
</span><span class="cx"> #include <WebCore/DiagnosticLoggingClient.h>
</span><span class="lines">@@ -281,21 +282,24 @@
</span><span class="cx"> SessionTracker::destroySession(sessionID);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void fetchDiskCacheEntries(SessionID sessionID, std::function<void (Vector<WebsiteData::Entry>)> completionHandler)
</del><ins>+static void fetchDiskCacheEntries(SessionID sessionID, OptionSet<WebsiteDataFetchOption> fetchOptions, std::function<void (Vector<WebsiteData::Entry>)> completionHandler)
</ins><span class="cx"> {
</span><span class="cx"> #if ENABLE(NETWORK_CACHE)
</span><span class="cx"> if (NetworkCache::singleton().isEnabled()) {
</span><del>- auto* origins = new HashSet<RefPtr<SecurityOrigin>>();
</del><ins>+ auto* originsAndSizes = new HashMap<RefPtr<SecurityOrigin>, uint64_t>();
</ins><span class="cx">
</span><del>- NetworkCache::singleton().traverse([completionHandler, origins](const NetworkCache::Cache::TraversalEntry *traversalEntry) {
</del><ins>+ NetworkCache::singleton().traverse([fetchOptions, completionHandler, originsAndSizes](const NetworkCache::Cache::TraversalEntry *traversalEntry) {
</ins><span class="cx"> if (!traversalEntry) {
</span><span class="cx"> Vector<WebsiteData::Entry> entries;
</span><span class="cx">
</span><del>- for (auto& origin : *origins)
- entries.append(WebsiteData::Entry { origin, WebsiteDataType::DiskCache });
</del><ins>+ for (auto& originAndSize : *originsAndSizes) {
+ WebsiteData::Entry entry { originAndSize.key, WebsiteDataType::DiskCache, originAndSize.value };
</ins><span class="cx">
</span><del>- delete origins;
</del><ins>+ entries.append(WTFMove(entry));
+ }
</ins><span class="cx">
</span><ins>+ delete originsAndSizes;
+
</ins><span class="cx"> RunLoop::main().dispatch([completionHandler, entries] {
</span><span class="cx"> completionHandler(entries);
</span><span class="cx"> });
</span><span class="lines">@@ -303,7 +307,10 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- origins->add(SecurityOrigin::create(traversalEntry->entry.response().url()));
</del><ins>+ auto result = originsAndSizes->add(SecurityOrigin::create(traversalEntry->entry.response().url()), 0);
+
+ if (fetchOptions.contains(WebsiteDataFetchOption::ComputeSizes))
+ result.iterator->value += traversalEntry->entry.sourceStorageRecord().header.size() + traversalEntry->recordInfo.bodySize;
</ins><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> return;
</span><span class="lines">@@ -314,7 +321,7 @@
</span><span class="cx">
</span><span class="cx"> #if USE(CFURLCACHE)
</span><span class="cx"> for (auto& origin : NetworkProcess::cfURLCacheOrigins())
</span><del>- entries.append(WebsiteData::Entry { WTFMove(origin), WebsiteDataType::DiskCache });
</del><ins>+ entries.append(WebsiteData::Entry { WTFMove(origin), WebsiteDataType::DiskCache, 0 });
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> RunLoop::main().dispatch([completionHandler, entries] {
</span><span class="lines">@@ -322,7 +329,7 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void NetworkProcess::fetchWebsiteData(SessionID sessionID, OptionSet<WebsiteDataType> websiteDataTypes, uint64_t callbackID)
</del><ins>+void NetworkProcess::fetchWebsiteData(SessionID sessionID, OptionSet<WebsiteDataType> websiteDataTypes, OptionSet<WebsiteDataFetchOption> fetchOptions, uint64_t callbackID)
</ins><span class="cx"> {
</span><span class="cx"> struct CallbackAggregator final : public RefCounted<CallbackAggregator> {
</span><span class="cx"> explicit CallbackAggregator(std::function<void (WebsiteData)> completionHandler)
</span><span class="lines">@@ -356,7 +363,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (websiteDataTypes.contains(WebsiteDataType::DiskCache)) {
</span><del>- fetchDiskCacheEntries(sessionID, [callbackAggregator](Vector<WebsiteData::Entry> entries) {
</del><ins>+ fetchDiskCacheEntries(sessionID, fetchOptions, [callbackAggregator](Vector<WebsiteData::Entry> entries) {
</ins><span class="cx"> callbackAggregator->m_websiteData.entries.appendVector(entries);
</span><span class="cx"> });
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkProcessh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h (197202 => 197203)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h 2016-02-26 22:24:29 UTC (rev 197202)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h 2016-02-26 22:26:03 UTC (rev 197203)
</span><span class="lines">@@ -54,6 +54,7 @@
</span><span class="cx"> class AuthenticationManager;
</span><span class="cx"> class NetworkConnectionToWebProcess;
</span><span class="cx"> class NetworkProcessSupplement;
</span><ins>+enum class WebsiteDataFetchOption;
</ins><span class="cx"> enum class WebsiteDataType;
</span><span class="cx"> struct NetworkProcessCreationParameters;
</span><span class="cx">
</span><span class="lines">@@ -151,7 +152,7 @@
</span><span class="cx"> void ensurePrivateBrowsingSession(WebCore::SessionID);
</span><span class="cx"> void destroyPrivateBrowsingSession(WebCore::SessionID);
</span><span class="cx">
</span><del>- void fetchWebsiteData(WebCore::SessionID, OptionSet<WebsiteDataType>, uint64_t callbackID);
</del><ins>+ void fetchWebsiteData(WebCore::SessionID, OptionSet<WebsiteDataType>, OptionSet<WebsiteDataFetchOption>, uint64_t callbackID);
</ins><span class="cx"> void deleteWebsiteData(WebCore::SessionID, OptionSet<WebsiteDataType>, std::chrono::system_clock::time_point modifiedSince, uint64_t callbackID);
</span><span class="cx"> void deleteWebsiteDataForOrigins(WebCore::SessionID, OptionSet<WebsiteDataType>, const Vector<WebCore::SecurityOriginData>& origins, const Vector<String>& cookieHostNames, uint64_t callbackID);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkProcessmessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcess.messages.in (197202 => 197203)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkProcess.messages.in 2016-02-26 22:24:29 UTC (rev 197202)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcess.messages.in 2016-02-26 22:26:03 UTC (rev 197203)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx"> EnsurePrivateBrowsingSession(WebCore::SessionID sessionID)
</span><span class="cx"> DestroyPrivateBrowsingSession(WebCore::SessionID sessionID)
</span><span class="cx">
</span><del>- FetchWebsiteData(WebCore::SessionID sessionID, OptionSet<WebKit::WebsiteDataType> websiteDataTypes, uint64_t callbackID)
</del><ins>+ FetchWebsiteData(WebCore::SessionID sessionID, OptionSet<WebKit::WebsiteDataType> websiteDataTypes, OptionSet<WebKit::WebsiteDataFetchOption> fetchOptions, uint64_t callbackID)
</ins><span class="cx"> DeleteWebsiteData(WebCore::SessionID sessionID, OptionSet<WebKit::WebsiteDataType> websiteDataTypes, std::chrono::system_clock::time_point modifiedSince, uint64_t callbackID)
</span><span class="cx"> DeleteWebsiteDataForOrigins(WebCore::SessionID sessionID, OptionSet<WebKit::WebsiteDataType> websiteDataTypes, Vector<WebCore::SecurityOriginData> origins, Vector<String> cookieHostNames, uint64_t callbackID)
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebsiteDataWebsiteDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebsiteData/WebsiteData.cpp (197202 => 197203)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebsiteData/WebsiteData.cpp 2016-02-26 22:24:29 UTC (rev 197202)
+++ trunk/Source/WebKit2/Shared/WebsiteData/WebsiteData.cpp 2016-02-26 22:26:03 UTC (rev 197203)
</span><span class="lines">@@ -36,6 +36,7 @@
</span><span class="cx"> {
</span><span class="cx"> encoder << WebCore::SecurityOriginData::fromSecurityOrigin(*origin);
</span><span class="cx"> encoder.encodeEnum(type);
</span><ins>+ encoder << size;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool WebsiteData::Entry::decode(IPC::ArgumentDecoder& decoder, WebsiteData::Entry& result)
</span><span class="lines">@@ -47,6 +48,9 @@
</span><span class="cx"> if (!decoder.decodeEnum(result.type))
</span><span class="cx"> return false;
</span><span class="cx">
</span><ins>+ if (!decoder.decode(result.size))
+ return false;
+
</ins><span class="cx"> result.origin = securityOriginData.securityOrigin();
</span><span class="cx"> return true;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebsiteDataWebsiteDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebsiteData/WebsiteData.h (197202 => 197203)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebsiteData/WebsiteData.h 2016-02-26 22:24:29 UTC (rev 197202)
+++ trunk/Source/WebKit2/Shared/WebsiteData/WebsiteData.h 2016-02-26 22:26:03 UTC (rev 197203)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx"> #define WebsiteData_h
</span><span class="cx">
</span><span class="cx"> #include <WebCore/SecurityOrigin.h>
</span><ins>+#include <wtf/HashMap.h>
</ins><span class="cx"> #include <wtf/HashSet.h>
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx">
</span><span class="lines">@@ -43,6 +44,7 @@
</span><span class="cx"> struct Entry {
</span><span class="cx"> RefPtr<WebCore::SecurityOrigin> origin;
</span><span class="cx"> WebsiteDataType type;
</span><ins>+ uint64_t size;
</ins><span class="cx">
</span><span class="cx"> void encode(IPC::ArgumentEncoder&) const;
</span><span class="cx"> static bool decode(IPC::ArgumentDecoder&, WebsiteData::Entry&);
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebsiteDataWebsiteDataFetchOptionhfromrev197197trunkSourceWebKit2UIProcessAPICocoaWKWebsiteDataRecordPrivateh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/Shared/WebsiteData/WebsiteDataFetchOption.h (from rev 197197, trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataRecordPrivate.h) (0 => 197203)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebsiteData/WebsiteDataFetchOption.h (rev 0)
+++ trunk/Source/WebKit2/Shared/WebsiteData/WebsiteDataFetchOption.h 2016-02-26 22:26:03 UTC (rev 197203)
</span><span class="lines">@@ -0,0 +1,38 @@
</span><ins>+/*
+ * Copyright (C) 2016 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef WebsiteDataFetchOption_h
+#define WebsiteDataFetchOption_h
+
+namespace WebKit {
+
+enum class WebsiteDataFetchOption {
+ ComputeSizes = 1 << 0,
+};
+
+}
+
+
+#endif // WebsiteDataFetchOption_h
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKApplicationCacheManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKApplicationCacheManager.cpp (197202 => 197203)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKApplicationCacheManager.cpp 2016-02-26 22:24:29 UTC (rev 197202)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKApplicationCacheManager.cpp 2016-02-26 22:26:03 UTC (rev 197203)
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx"> void WKApplicationCacheManagerGetApplicationCacheOrigins(WKApplicationCacheManagerRef applicationCacheManager, void* context, WKApplicationCacheManagerGetApplicationCacheOriginsFunction callback)
</span><span class="cx"> {
</span><span class="cx"> auto& websiteDataStore = toImpl(reinterpret_cast<WKWebsiteDataStoreRef>(applicationCacheManager))->websiteDataStore();
</span><del>- websiteDataStore.fetchData(WebsiteDataType::OfflineWebApplicationCache, [context, callback](Vector<WebsiteDataRecord> dataRecords) {
</del><ins>+ websiteDataStore.fetchData(WebsiteDataType::OfflineWebApplicationCache, { }, [context, callback](Vector<WebsiteDataRecord> dataRecords) {
</ins><span class="cx"> Vector<RefPtr<API::Object>> securityOrigins;
</span><span class="cx"> for (const auto& dataRecord : dataRecords) {
</span><span class="cx"> for (const auto& origin : dataRecord.origins)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKResourceCacheManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKResourceCacheManager.cpp (197202 => 197203)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKResourceCacheManager.cpp 2016-02-26 22:24:29 UTC (rev 197202)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKResourceCacheManager.cpp 2016-02-26 22:26:03 UTC (rev 197203)
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx"> void WKResourceCacheManagerGetCacheOrigins(WKResourceCacheManagerRef cacheManager, void* context, WKResourceCacheManagerGetCacheOriginsFunction callback)
</span><span class="cx"> {
</span><span class="cx"> auto& websiteDataStore = toImpl(reinterpret_cast<WKWebsiteDataStoreRef>(cacheManager))->websiteDataStore();
</span><del>- websiteDataStore.fetchData(toWebsiteDataTypes(WKResourceCachesToClearAll), [context, callback](Vector<WebsiteDataRecord> dataRecords) {
</del><ins>+ websiteDataStore.fetchData(toWebsiteDataTypes(WKResourceCachesToClearAll), { }, [context, callback](Vector<WebsiteDataRecord> dataRecords) {
</ins><span class="cx"> Vector<RefPtr<API::Object>> securityOrigins;
</span><span class="cx"> for (const auto& dataRecord : dataRecords) {
</span><span class="cx"> for (const auto& origin : dataRecord.origins)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebsiteDataRecordmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataRecord.mm (197202 => 197203)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataRecord.mm 2016-02-26 22:24:29 UTC (rev 197202)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataRecord.mm 2016-02-26 22:26:03 UTC (rev 197203)
</span><span class="lines">@@ -28,6 +28,8 @@
</span><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span><ins>+#import "_WKWebsiteDataSizeInternal.h"
+
</ins><span class="cx"> NSString * const WKWebsiteDataTypeDiskCache = @"WKWebsiteDataTypeDiskCache";
</span><span class="cx"> NSString * const WKWebsiteDataTypeMemoryCache = @"WKWebsiteDataTypeMemoryCache";
</span><span class="cx"> NSString * const WKWebsiteDataTypeOfflineWebApplicationCache = @"WKWebsiteDataTypeOfflineWebApplicationCache";
</span><span class="lines">@@ -92,7 +94,13 @@
</span><span class="cx">
</span><span class="cx"> - (NSString *)description
</span><span class="cx"> {
</span><del>- return [NSString stringWithFormat:@"<%@: %p; displayName = %@; dataTypes = { %@ }>", NSStringFromClass(self.class), self, self.displayName, dataTypesToString(self.dataTypes)];
</del><ins>+ auto result = adoptNS([[NSMutableString alloc] initWithFormat:@"<%@: %p; displayName = %@; dataTypes = { %@ }", NSStringFromClass(self.class), self, self.displayName, dataTypesToString(self.dataTypes)]);
+
+ if (auto* dataSize = self._dataSize)
+ [result appendFormat:@"; _dataSize = { %llu bytes }", dataSize.totalSize];
+
+ [result appendString:@">"];
+ return result.autorelease();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (NSString *)displayName
</span><span class="lines">@@ -114,4 +122,18 @@
</span><span class="cx">
</span><span class="cx"> @end
</span><span class="cx">
</span><ins>+@implementation WKWebsiteDataRecord (WKPrivate)
+
+- (_WKWebsiteDataSize *)_dataSize
+{
+ auto& size = _websiteDataRecord->websiteDataRecord().size;
+
+ if (!size)
+ return nil;
+
+ return [[[_WKWebsiteDataSize alloc] initWithSize:*size] autorelease];
+}
+
+@end
+
</ins><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebsiteDataRecordPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataRecordPrivate.h (197202 => 197203)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataRecordPrivate.h 2016-02-26 22:24:29 UTC (rev 197202)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataRecordPrivate.h 2016-02-26 22:26:03 UTC (rev 197203)
</span><span class="lines">@@ -27,6 +27,10 @@
</span><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span><ins>+NS_ASSUME_NONNULL_BEGIN
+
+@class _WKWebsiteDataSize;
+
</ins><span class="cx"> WK_EXTERN NSString * const _WKWebsiteDataTypeHSTSCache WK_AVAILABLE(10_11, 9_0);
</span><span class="cx"> WK_EXTERN NSString * const _WKWebsiteDataTypeMediaKeys WK_AVAILABLE(10_11, 9_0);
</span><span class="cx"> WK_EXTERN NSString * const _WKWebsiteDataTypeSearchFieldRecentSearches WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
</span><span class="lines">@@ -35,4 +39,12 @@
</span><span class="cx"> WK_EXTERN NSString * const _WKWebsiteDataTypePlugInData WK_AVAILABLE(10_11, NA);
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+@interface WKWebsiteDataRecord (WKPrivate)
+
+@property (nullable, nonatomic, readonly) _WKWebsiteDataSize *_dataSize;
+
+@end
+
+NS_ASSUME_NONNULL_END
+
</ins><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebsiteDataStoremm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataStore.mm (197202 => 197203)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataStore.mm 2016-02-26 22:24:29 UTC (rev 197202)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataStore.mm 2016-02-26 22:26:03 UTC (rev 197203)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx">
</span><span class="cx"> #import "WKNSArray.h"
</span><span class="cx"> #import "WKWebsiteDataRecordInternal.h"
</span><ins>+#import "WebsiteDataFetchOption.h"
</ins><span class="cx"> #import <wtf/BlockPtr.h>
</span><span class="cx">
</span><span class="cx"> @implementation WKWebsiteDataStore
</span><span class="lines">@@ -103,17 +104,7 @@
</span><span class="cx">
</span><span class="cx"> - (void)fetchDataRecordsOfTypes:(NSSet *)dataTypes completionHandler:(void (^)(WK_ARRAY(WKWebsiteDataRecord *) *))completionHandler
</span><span class="cx"> {
</span><del>- auto completionHandlerCopy = makeBlockPtr(completionHandler);
-
- _websiteDataStore->websiteDataStore().fetchData(WebKit::toWebsiteDataTypes(dataTypes), [completionHandlerCopy](Vector<WebKit::WebsiteDataRecord> websiteDataRecords) {
- Vector<RefPtr<API::Object>> elements;
- elements.reserveInitialCapacity(websiteDataRecords.size());
-
- for (auto& websiteDataRecord : websiteDataRecords)
- elements.uncheckedAppend(API::WebsiteDataRecord::create(WTFMove(websiteDataRecord)));
-
- completionHandlerCopy(wrapper(API::Array::create(WTFMove(elements))));
- });
</del><ins>+ [self _fetchDataRecordsOfTypes:dataTypes withOptions:0 completionHandler:completionHandler];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)removeDataOfTypes:(NSSet *)dataTypes modifiedSince:(NSDate *)date completionHandler:(void (^)(void))completionHandler
</span><span class="lines">@@ -152,4 +143,27 @@
</span><span class="cx">
</span><span class="cx"> @end
</span><span class="cx">
</span><ins>+@implementation WKWebsiteDataStore (WKPrivate)
+
+- (void)_fetchDataRecordsOfTypes:(WK_SET(NSString *) *)dataTypes withOptions:(_WKWebsiteDataStoreFetchOptions)options completionHandler:(void (^)(WK_ARRAY(WKWebsiteDataRecord *) *))completionHandler
+{
+ auto completionHandlerCopy = makeBlockPtr(completionHandler);
+
+ OptionSet<WebKit::WebsiteDataFetchOption> fetchOptions;
+ if (options & _WKWebsiteDataStoreFetchOptionComputeSizes)
+ fetchOptions |= WebKit::WebsiteDataFetchOption::ComputeSizes;
+
+ _websiteDataStore->websiteDataStore().fetchData(WebKit::toWebsiteDataTypes(dataTypes), fetchOptions, [completionHandlerCopy](Vector<WebKit::WebsiteDataRecord> websiteDataRecords) {
+ Vector<RefPtr<API::Object>> elements;
+ elements.reserveInitialCapacity(websiteDataRecords.size());
+
+ for (auto& websiteDataRecord : websiteDataRecords)
+ elements.uncheckedAppend(API::WebsiteDataRecord::create(WTFMove(websiteDataRecord)));
+
+ completionHandlerCopy(wrapper(API::Array::create(WTFMove(elements))));
+ });
+}
+
+@end
+
</ins><span class="cx"> #endif // WK_API_ENABLED
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebsiteDataStoreInternalh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataStoreInternal.h (197202 => 197203)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataStoreInternal.h 2016-02-26 22:24:29 UTC (rev 197202)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataStoreInternal.h 2016-02-26 22:26:03 UTC (rev 197203)
</span><span class="lines">@@ -23,7 +23,7 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#import "WKWebsiteDataStore.h"
</del><ins>+#import "WKWebsiteDataStorePrivate.h"
</ins><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebsiteDataStorePrivatehfromrev197197trunkSourceWebKit2UIProcessAPICocoaWKWebsiteDataStoreInternalh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataStorePrivate.h (from rev 197197, trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataStoreInternal.h) (0 => 197203)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataStorePrivate.h (rev 0)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataStorePrivate.h 2016-02-26 22:26:03 UTC (rev 197203)
</span><span class="lines">@@ -0,0 +1,44 @@
</span><ins>+/*
+ * Copyright (C) 2016 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import <WebKit/WKWebsiteDataStore.h>
+
+#if WK_API_ENABLED
+
+NS_ASSUME_NONNULL_BEGIN
+
+typedef NS_OPTIONS(NSUInteger, _WKWebsiteDataStoreFetchOptions) {
+ _WKWebsiteDataStoreFetchOptionComputeSizes = 1 << 0,
+} WK_ENUM_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
+
+@interface WKWebsiteDataStore (WKPrivate)
+
+- (void)_fetchDataRecordsOfTypes:(WK_SET(NSString *) *)dataTypes withOptions:(_WKWebsiteDataStoreFetchOptions)options completionHandler:(void (^)(WK_ARRAY(WKWebsiteDataRecord *) *))completionHandler;
+
+@end
+
+NS_ASSUME_NONNULL_END
+
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoa_WKWebsiteDataSizehfromrev197197trunkSourceWebKit2UIProcessAPICocoaWKWebsiteDataRecordPrivateh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataSize.h (from rev 197197, trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataRecordPrivate.h) (0 => 197203)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataSize.h (rev 0)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataSize.h 2016-02-26 22:26:03 UTC (rev 197203)
</span><span class="lines">@@ -0,0 +1,45 @@
</span><ins>+/*
+ * Copyright (C) 2016 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import <WebKit/WKFoundation.h>
+
+#if WK_API_ENABLED
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+WK_CLASS_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA)
+@interface _WKWebsiteDataSize : NSObject
+
+@property (nonatomic, readonly) unsigned long long totalSize;
+
+- (unsigned long long)sizeOfDataTypes:(WK_SET(NSString *) *)dataTypes;
+
+@end
+
+NS_ASSUME_NONNULL_END
+
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoa_WKWebsiteDataSizemmfromrev197197trunkSourceWebKit2UIProcessAPICocoaWKWebsiteDataStoreInternalh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataSize.mm (from rev 197197, trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataStoreInternal.h) (0 => 197203)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataSize.mm (rev 0)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataSize.mm 2016-02-26 22:26:03 UTC (rev 197203)
</span><span class="lines">@@ -0,0 +1,64 @@
</span><ins>+/*
+ * Copyright (C) 2016 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import "config.h"
+#import "_WKWebsiteDataSizeInternal.h"
+
+#if WK_API_ENABLED
+
+#import "WKWebsiteDataRecordInternal.h"
+
+@implementation _WKWebsiteDataSize
+
+- (instancetype)initWithSize:(const WebKit::WebsiteDataRecord::Size&)size
+{
+ if (!(self = [super init]))
+ return nil;
+
+ _size = size;
+
+ return self;
+}
+
+- (unsigned long long)totalSize
+{
+ return _size.totalSize;
+}
+
+- (unsigned long long)sizeOfDataTypes:(NSSet<NSString *> *)dataTypes
+{
+ unsigned long long size = 0;
+
+ for (NSString *dataType in dataTypes) {
+ if (auto websiteDataType = WebKit::toWebsiteDataType(dataType))
+ size += _size.typeSizes.get(static_cast<unsigned>(*websiteDataType));
+ }
+
+ return size;
+}
+
+@end
+
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoa_WKWebsiteDataSizeInternalhfromrev197197trunkSourceWebKit2UIProcessAPICocoaWKWebsiteDataRecordPrivateh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataSizeInternal.h (from rev 197197, trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataRecordPrivate.h) (0 => 197203)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataSizeInternal.h (rev 0)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataSizeInternal.h 2016-02-26 22:26:03 UTC (rev 197203)
</span><span class="lines">@@ -0,0 +1,40 @@
</span><ins>+/*
+ * Copyright (C) 2016 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import "_WKWebsiteDataSize.h"
+
+#if WK_API_ENABLED
+
+#import "WebsiteDataRecord.h"
+
+@interface _WKWebsiteDataSize () {
+ WebKit::WebsiteDataRecord::Size _size;
+}
+
+- (instancetype)initWithSize:(const WebKit::WebsiteDataRecord::Size&)size;
+
+@end
+
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessNetworkNetworkProcessProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp (197202 => 197203)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp 2016-02-26 22:24:29 UTC (rev 197202)
+++ trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp 2016-02-26 22:26:03 UTC (rev 197203)
</span><span class="lines">@@ -118,7 +118,7 @@
</span><span class="cx"> return m_downloadProxyMap->createDownloadProxy(m_processPool, resourceRequest);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void NetworkProcessProxy::fetchWebsiteData(SessionID sessionID, OptionSet<WebsiteDataType> dataTypes, std::function<void (WebsiteData)> completionHandler)
</del><ins>+void NetworkProcessProxy::fetchWebsiteData(SessionID sessionID, OptionSet<WebsiteDataType> dataTypes, OptionSet<WebsiteDataFetchOption> fetchOptions, std::function<void (WebsiteData)> completionHandler)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(canSendMessage());
</span><span class="cx">
</span><span class="lines">@@ -129,7 +129,7 @@
</span><span class="cx"> completionHandler(WTFMove(websiteData));
</span><span class="cx"> });
</span><span class="cx">
</span><del>- send(Messages::WebProcess::FetchWebsiteData(sessionID, dataTypes, callbackID), 0);
</del><ins>+ send(Messages::NetworkProcess::FetchWebsiteData(sessionID, dataTypes, fetchOptions, callbackID), 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void NetworkProcessProxy::deleteWebsiteData(WebCore::SessionID sessionID, OptionSet<WebsiteDataType> dataTypes, std::chrono::system_clock::time_point modifiedSince, std::function<void ()> completionHandler)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessNetworkNetworkProcessProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.h (197202 => 197203)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.h 2016-02-26 22:24:29 UTC (rev 197202)
+++ trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.h 2016-02-26 22:26:03 UTC (rev 197203)
</span><span class="lines">@@ -47,6 +47,7 @@
</span><span class="cx"> class DownloadProxy;
</span><span class="cx"> class DownloadProxyMap;
</span><span class="cx"> class WebProcessPool;
</span><ins>+enum class WebsiteDataFetchOption;
</ins><span class="cx"> enum class WebsiteDataType;
</span><span class="cx"> struct NetworkProcessCreationParameters;
</span><span class="cx">
</span><span class="lines">@@ -59,7 +60,7 @@
</span><span class="cx">
</span><span class="cx"> DownloadProxy* createDownloadProxy(const WebCore::ResourceRequest&);
</span><span class="cx">
</span><del>- void fetchWebsiteData(WebCore::SessionID, OptionSet<WebsiteDataType>, std::function<void (WebsiteData)> completionHandler);
</del><ins>+ void fetchWebsiteData(WebCore::SessionID, OptionSet<WebsiteDataType>, OptionSet<WebsiteDataFetchOption>, std::function<void (WebsiteData)> completionHandler);
</ins><span class="cx"> void deleteWebsiteData(WebCore::SessionID, OptionSet<WebsiteDataType>, std::chrono::system_clock::time_point modifiedSince, std::function<void ()> completionHandler);
</span><span class="cx"> void deleteWebsiteDataForOrigins(WebCore::SessionID, OptionSet<WebKit::WebsiteDataType>, const Vector<RefPtr<WebCore::SecurityOrigin>>& origins, const Vector<String>& cookieHostNames, std::function<void ()> completionHandler);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebsiteDataWebsiteDataRecordh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataRecord.h (197202 => 197203)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataRecord.h 2016-02-26 22:24:29 UTC (rev 197202)
+++ trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataRecord.h 2016-02-26 22:26:03 UTC (rev 197203)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx"> #include <WebCore/SecurityOriginHash.h>
</span><span class="cx"> #include <wtf/HashSet.h>
</span><span class="cx"> #include <wtf/OptionSet.h>
</span><ins>+#include <wtf/Optional.h>
</ins><span class="cx"> #include <wtf/text/StringHash.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="lines">@@ -54,6 +55,13 @@
</span><span class="cx">
</span><span class="cx"> String displayName;
</span><span class="cx"> OptionSet<WebsiteDataType> types;
</span><ins>+
+ struct Size {
+ uint64_t totalSize;
+ HashMap<unsigned, uint64_t> typeSizes;
+ };
+ Optional<Size> size;
+
</ins><span class="cx"> HashSet<RefPtr<WebCore::SecurityOrigin>> origins;
</span><span class="cx"> HashSet<String> cookieHostNames;
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebsiteDataWebsiteDataStorecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp (197202 => 197203)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp 2016-02-26 22:24:29 UTC (rev 197202)
+++ trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp 2016-02-26 22:26:03 UTC (rev 197203)
</span><span class="lines">@@ -150,11 +150,12 @@
</span><span class="cx"> return processAccessType;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebsiteDataStore::fetchData(OptionSet<WebsiteDataType> dataTypes, std::function<void (Vector<WebsiteDataRecord>)> completionHandler)
</del><ins>+void WebsiteDataStore::fetchData(OptionSet<WebsiteDataType> dataTypes, OptionSet<WebsiteDataFetchOption> fetchOptions, std::function<void (Vector<WebsiteDataRecord>)> completionHandler)
</ins><span class="cx"> {
</span><span class="cx"> struct CallbackAggregator final : ThreadSafeRefCounted<CallbackAggregator> {
</span><del>- explicit CallbackAggregator(std::function<void (Vector<WebsiteDataRecord>)> completionHandler)
- : completionHandler(WTFMove(completionHandler))
</del><ins>+ explicit CallbackAggregator(OptionSet<WebsiteDataFetchOption> fetchOptions, std::function<void (Vector<WebsiteDataRecord>)> completionHandler)
+ : fetchOptions(fetchOptions)
+ , completionHandler(WTFMove(completionHandler))
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -183,6 +184,14 @@
</span><span class="cx"> record.displayName = WTFMove(displayName);
</span><span class="cx">
</span><span class="cx"> record.add(entry.type, WTFMove(entry.origin));
</span><ins>+
+ if (fetchOptions.contains(WebsiteDataFetchOption::ComputeSizes)) {
+ if (!record.size)
+ record.size = WebsiteDataRecord::Size { 0, { } };
+
+ record.size->totalSize += entry.size;
+ record.size->typeSizes.add(static_cast<unsigned>(entry.type), 0).iterator->value += entry.size;
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> for (auto& hostName : websiteData.hostNamesWithCookies) {
</span><span class="lines">@@ -232,13 +241,15 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ const OptionSet<WebsiteDataFetchOption> fetchOptions;
+
</ins><span class="cx"> unsigned pendingCallbacks = 0;
</span><span class="cx"> std::function<void (Vector<WebsiteDataRecord>)> completionHandler;
</span><span class="cx">
</span><span class="cx"> HashMap<String, WebsiteDataRecord> m_websiteDataRecords;
</span><span class="cx"> };
</span><span class="cx">
</span><del>- RefPtr<CallbackAggregator> callbackAggregator = adoptRef(new CallbackAggregator(WTFMove(completionHandler)));
</del><ins>+ RefPtr<CallbackAggregator> callbackAggregator = adoptRef(new CallbackAggregator(fetchOptions, WTFMove(completionHandler)));
</ins><span class="cx">
</span><span class="cx"> auto networkProcessAccessType = computeNetworkProcessAccessTypeForDataFetch(dataTypes, !isPersistent());
</span><span class="cx"> if (networkProcessAccessType != ProcessAccessType::None) {
</span><span class="lines">@@ -258,7 +269,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> callbackAggregator->addPendingCallback();
</span><del>- processPool->networkProcess()->fetchWebsiteData(m_sessionID, dataTypes, [callbackAggregator, processPool](WebsiteData websiteData) {
</del><ins>+ processPool->networkProcess()->fetchWebsiteData(m_sessionID, dataTypes, fetchOptions, [callbackAggregator, processPool](WebsiteData websiteData) {
</ins><span class="cx"> callbackAggregator->removePendingCallback(WTFMove(websiteData));
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="lines">@@ -296,7 +307,7 @@
</span><span class="cx"> WebsiteData websiteData;
</span><span class="cx">
</span><span class="cx"> while (!origins.isEmpty())
</span><del>- websiteData.entries.append(WebsiteData::Entry { origins.takeAny(), WebsiteDataType::SessionStorage });
</del><ins>+ websiteData.entries.append(WebsiteData::Entry { origins.takeAny(), WebsiteDataType::SessionStorage, 0 });
</ins><span class="cx">
</span><span class="cx"> callbackAggregator->removePendingCallback(WTFMove(websiteData));
</span><span class="cx"> });
</span><span class="lines">@@ -309,7 +320,7 @@
</span><span class="cx"> WebsiteData websiteData;
</span><span class="cx">
</span><span class="cx"> while (!origins.isEmpty())
</span><del>- websiteData.entries.append(WebsiteData::Entry { origins.takeAny(), WebsiteDataType::LocalStorage });
</del><ins>+ websiteData.entries.append(WebsiteData::Entry { origins.takeAny(), WebsiteDataType::LocalStorage, 0 });
</ins><span class="cx">
</span><span class="cx"> callbackAggregator->removePendingCallback(WTFMove(websiteData));
</span><span class="cx"> });
</span><span class="lines">@@ -320,19 +331,25 @@
</span><span class="cx">
</span><span class="cx"> callbackAggregator->addPendingCallback();
</span><span class="cx">
</span><del>- m_queue->dispatch([applicationCacheDirectory, callbackAggregator] {
</del><ins>+ m_queue->dispatch([fetchOptions, applicationCacheDirectory, callbackAggregator] {
</ins><span class="cx"> auto storage = WebCore::ApplicationCacheStorage::create(applicationCacheDirectory.string(), "Files");
</span><span class="cx">
</span><ins>+ WebsiteData* websiteData = new WebsiteData;
+
</ins><span class="cx"> HashSet<RefPtr<WebCore::SecurityOrigin>> origins;
</span><span class="cx"> storage->getOriginsWithCache(origins);
</span><span class="cx">
</span><del>- WTF::RunLoop::main().dispatch([callbackAggregator, origins]() mutable {
- WebsiteData websiteData;
</del><ins>+ for (auto& origin : origins) {
+ uint64_t size = fetchOptions.contains(WebsiteDataFetchOption::ComputeSizes) ? storage->diskUsageForOrigin(*origin) : 0;
+ WebsiteData::Entry entry { origin, WebsiteDataType::OfflineWebApplicationCache, size };
</ins><span class="cx">
</span><del>- for (auto& origin : origins)
- websiteData.entries.append(WebsiteData::Entry { origin, WebsiteDataType::OfflineWebApplicationCache });
</del><ins>+ websiteData->entries.append(WTFMove(entry));
+ }
</ins><span class="cx">
</span><del>- callbackAggregator->removePendingCallback(WTFMove(websiteData));
</del><ins>+ WTF::RunLoop::main().dispatch([callbackAggregator, origins, websiteData]() mutable {
+ callbackAggregator->removePendingCallback(WTFMove(*websiteData));
+
+ delete websiteData;
</ins><span class="cx"> });
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="lines">@@ -349,7 +366,7 @@
</span><span class="cx"> RunLoop::main().dispatch([callbackAggregator, origins]() mutable {
</span><span class="cx"> WebsiteData websiteData;
</span><span class="cx"> for (auto& origin : origins)
</span><del>- websiteData.entries.append(WebsiteData::Entry { WTFMove(origin), WebsiteDataType::WebSQLDatabases });
</del><ins>+ websiteData.entries.append(WebsiteData::Entry { WTFMove(origin), WebsiteDataType::WebSQLDatabases, 0 });
</ins><span class="cx">
</span><span class="cx"> callbackAggregator->removePendingCallback(WTFMove(websiteData));
</span><span class="cx"> });
</span><span class="lines">@@ -380,7 +397,7 @@
</span><span class="cx"> RunLoop::main().dispatch([callbackAggregator, origins]() mutable {
</span><span class="cx"> WebsiteData websiteData;
</span><span class="cx"> for (auto& origin : origins)
</span><del>- websiteData.entries.append(WebsiteData::Entry { WTFMove(origin), WebsiteDataType::MediaKeys });
</del><ins>+ websiteData.entries.append(WebsiteData::Entry { WTFMove(origin), WebsiteDataType::MediaKeys, 0 });
</ins><span class="cx">
</span><span class="cx"> callbackAggregator->removePendingCallback(WTFMove(websiteData));
</span><span class="cx"> });
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebsiteDataWebsiteDataStoreh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.h (197202 => 197203)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.h 2016-02-26 22:24:29 UTC (rev 197202)
+++ trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.h 2016-02-26 22:26:03 UTC (rev 197203)
</span><span class="lines">@@ -46,6 +46,7 @@
</span><span class="cx"> class StorageManager;
</span><span class="cx"> class WebPageProxy;
</span><span class="cx"> class WebProcessPool;
</span><ins>+enum class WebsiteDataFetchOption;
</ins><span class="cx"> enum class WebsiteDataType;
</span><span class="cx"> struct WebsiteDataRecord;
</span><span class="cx">
</span><span class="lines">@@ -74,7 +75,7 @@
</span><span class="cx">
</span><span class="cx"> static void cloneSessionData(WebPageProxy& sourcePage, WebPageProxy& newPage);
</span><span class="cx">
</span><del>- void fetchData(OptionSet<WebsiteDataType>, std::function<void (Vector<WebsiteDataRecord>)> completionHandler);
</del><ins>+ void fetchData(OptionSet<WebsiteDataType>, OptionSet<WebsiteDataFetchOption>, std::function<void (Vector<WebsiteDataRecord>)> completionHandler);
</ins><span class="cx"> void removeData(OptionSet<WebsiteDataType>, std::chrono::system_clock::time_point modifiedSince, std::function<void ()> completionHandler);
</span><span class="cx"> void removeData(OptionSet<WebsiteDataType>, const Vector<WebsiteDataRecord>&, std::function<void ()> completionHandler);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (197202 => 197203)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2016-02-26 22:24:29 UTC (rev 197202)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2016-02-26 22:26:03 UTC (rev 197203)
</span><span class="lines">@@ -235,8 +235,6 @@
</span><span class="cx"> 1A44B95B16B73F9F00B7BBD8 /* StorageManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A44B95916B73F9F00B7BBD8 /* StorageManager.cpp */; };
</span><span class="cx"> 1A44B95C16B73F9F00B7BBD8 /* StorageManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A44B95A16B73F9F00B7BBD8 /* StorageManager.h */; };
</span><span class="cx"> 1A4832C31A965A3C008B4DFE /* WebsiteDataStoreCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A4832C11A965A3C008B4DFE /* WebsiteDataStoreCocoa.mm */; };
</span><del>- 1A4832C71A9BC13C008B4DFE /* APIWebsiteDataRecord.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A4832C51A9BC13C008B4DFE /* APIWebsiteDataRecord.cpp */; };
- 1A4832C81A9BC13C008B4DFE /* APIWebsiteDataRecord.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A4832C61A9BC13C008B4DFE /* APIWebsiteDataRecord.h */; };
</del><span class="cx"> 1A4832CB1A9BC465008B4DFE /* WKWebsiteDataRecord.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A4832C91A9BC465008B4DFE /* WKWebsiteDataRecord.mm */; };
</span><span class="cx"> 1A4832CC1A9BC465008B4DFE /* WKWebsiteDataRecord.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A4832CA1A9BC465008B4DFE /* WKWebsiteDataRecord.h */; settings = {ATTRIBUTES = (Public, ); }; };
</span><span class="cx"> 1A4832CE1A9BC484008B4DFE /* WKWebsiteDataRecordInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A4832CD1A9BC484008B4DFE /* WKWebsiteDataRecordInternal.h */; };
</span><span class="lines">@@ -470,6 +468,12 @@
</span><span class="cx"> 1AE00D6B18327C1200087DD7 /* StringReference.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AE00D6918327C1200087DD7 /* StringReference.cpp */; };
</span><span class="cx"> 1AE00D6C18327C1200087DD7 /* StringReference.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AE00D6A18327C1200087DD7 /* StringReference.h */; };
</span><span class="cx"> 1AE117F611DBB30900981615 /* ProcessLauncher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AE117F511DBB30900981615 /* ProcessLauncher.cpp */; };
</span><ins>+ 1AE286771C7E76510069AC4F /* _WKWebsiteDataSize.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AE286751C7E76510069AC4F /* _WKWebsiteDataSize.mm */; };
+ 1AE286781C7E76510069AC4F /* _WKWebsiteDataSize.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AE286761C7E76510069AC4F /* _WKWebsiteDataSize.h */; };
+ 1AE2867A1C7F7BA60069AC4F /* WKWebsiteDataStorePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AE286791C7F7BA60069AC4F /* WKWebsiteDataStorePrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 1AE286801C7F92C00069AC4F /* _WKWebsiteDataSizeInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AE2867F1C7F92BF0069AC4F /* _WKWebsiteDataSizeInternal.h */; };
+ 1AE286831C7F93860069AC4F /* APIWebsiteDataRecord.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AE286811C7F93860069AC4F /* APIWebsiteDataRecord.cpp */; };
+ 1AE286841C7F93860069AC4F /* APIWebsiteDataRecord.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AE286821C7F93860069AC4F /* APIWebsiteDataRecord.h */; };
</ins><span class="cx"> 1AE4976811FF658E0048B464 /* NPJSObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AE4976611FF658E0048B464 /* NPJSObject.h */; };
</span><span class="cx"> 1AE4976911FF658E0048B464 /* NPJSObject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AE4976711FF658E0048B464 /* NPJSObject.cpp */; };
</span><span class="cx"> 1AE4987811FF7FAA0048B464 /* JSNPObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AE4987611FF7FAA0048B464 /* JSNPObject.h */; };
</span><span class="lines">@@ -2097,6 +2101,7 @@
</span><span class="cx"> 1A256E3518A1A788006FB922 /* WKNavigationAction.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKNavigationAction.mm; sourceTree = "<group>"; };
</span><span class="cx"> 1A256E3618A1A788006FB922 /* WKNavigationAction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKNavigationAction.h; sourceTree = "<group>"; };
</span><span class="cx"> 1A256E3918A1A7DF006FB922 /* WKNavigationActionInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKNavigationActionInternal.h; sourceTree = "<group>"; };
</span><ins>+ 1A28B8CB1C80ED59006FD743 /* WebsiteDataFetchOption.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebsiteDataFetchOption.h; sourceTree = "<group>"; };
</ins><span class="cx"> 1A2A4AFD158693920090C9E9 /* ColorSpaceData.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ColorSpaceData.mm; sourceTree = "<group>"; };
</span><span class="cx"> 1A2A4AFE158693920090C9E9 /* ColorSpaceData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ColorSpaceData.h; sourceTree = "<group>"; };
</span><span class="cx"> 1A2BB6CC14117A5F000F35D4 /* PluginProcessConnection.messages.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = PluginProcessConnection.messages.in; sourceTree = "<group>"; };
</span><span class="lines">@@ -2151,8 +2156,6 @@
</span><span class="cx"> 1A44B95916B73F9F00B7BBD8 /* StorageManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StorageManager.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 1A44B95A16B73F9F00B7BBD8 /* StorageManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StorageManager.h; sourceTree = "<group>"; };
</span><span class="cx"> 1A4832C11A965A3C008B4DFE /* WebsiteDataStoreCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebsiteDataStoreCocoa.mm; sourceTree = "<group>"; };
</span><del>- 1A4832C51A9BC13C008B4DFE /* APIWebsiteDataRecord.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = APIWebsiteDataRecord.cpp; sourceTree = "<group>"; };
- 1A4832C61A9BC13C008B4DFE /* APIWebsiteDataRecord.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APIWebsiteDataRecord.h; sourceTree = "<group>"; };
</del><span class="cx"> 1A4832C91A9BC465008B4DFE /* WKWebsiteDataRecord.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKWebsiteDataRecord.mm; sourceTree = "<group>"; };
</span><span class="cx"> 1A4832CA1A9BC465008B4DFE /* WKWebsiteDataRecord.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKWebsiteDataRecord.h; sourceTree = "<group>"; };
</span><span class="cx"> 1A4832CD1A9BC484008B4DFE /* WKWebsiteDataRecordInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKWebsiteDataRecordInternal.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -2415,6 +2418,12 @@
</span><span class="cx"> 1AE00D6918327C1200087DD7 /* StringReference.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StringReference.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 1AE00D6A18327C1200087DD7 /* StringReference.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StringReference.h; sourceTree = "<group>"; };
</span><span class="cx"> 1AE117F511DBB30900981615 /* ProcessLauncher.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ProcessLauncher.cpp; sourceTree = "<group>"; };
</span><ins>+ 1AE286751C7E76510069AC4F /* _WKWebsiteDataSize.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = _WKWebsiteDataSize.mm; sourceTree = "<group>"; };
+ 1AE286761C7E76510069AC4F /* _WKWebsiteDataSize.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKWebsiteDataSize.h; sourceTree = "<group>"; };
+ 1AE286791C7F7BA60069AC4F /* WKWebsiteDataStorePrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKWebsiteDataStorePrivate.h; sourceTree = "<group>"; };
+ 1AE2867F1C7F92BF0069AC4F /* _WKWebsiteDataSizeInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKWebsiteDataSizeInternal.h; sourceTree = "<group>"; };
+ 1AE286811C7F93860069AC4F /* APIWebsiteDataRecord.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = APIWebsiteDataRecord.cpp; sourceTree = "<group>"; };
+ 1AE286821C7F93860069AC4F /* APIWebsiteDataRecord.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APIWebsiteDataRecord.h; sourceTree = "<group>"; };
</ins><span class="cx"> 1AE4976611FF658E0048B464 /* NPJSObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NPJSObject.h; sourceTree = "<group>"; };
</span><span class="cx"> 1AE4976711FF658E0048B464 /* NPJSObject.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NPJSObject.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 1AE4987611FF7FAA0048B464 /* JSNPObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSNPObject.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -4607,6 +4616,7 @@
</span><span class="cx"> children = (
</span><span class="cx"> 1A4832D41A9CDF96008B4DFE /* WebsiteData.cpp */,
</span><span class="cx"> 1A4832D51A9CDF96008B4DFE /* WebsiteData.h */,
</span><ins>+ 1A28B8CB1C80ED59006FD743 /* WebsiteDataFetchOption.h */,
</ins><span class="cx"> 1ABF43791A368050003FB0E6 /* WebsiteDataType.h */,
</span><span class="cx"> );
</span><span class="cx"> path = WebsiteData;
</span><span class="lines">@@ -4983,6 +4993,9 @@
</span><span class="cx"> 1A81B37F18BD66AD0007FDAC /* _WKVisitedLinkStore.h */,
</span><span class="cx"> 1A81B37E18BD66AD0007FDAC /* _WKVisitedLinkStore.mm */,
</span><span class="cx"> 1A81B38418BD673A0007FDAC /* _WKVisitedLinkStoreInternal.h */,
</span><ins>+ 1AE286751C7E76510069AC4F /* _WKWebsiteDataSize.mm */,
+ 1AE286761C7E76510069AC4F /* _WKWebsiteDataSize.h */,
+ 1AE2867F1C7F92BF0069AC4F /* _WKWebsiteDataSizeInternal.h */,
</ins><span class="cx"> FED3C1DA1B447AE800E0EB7F /* APISerializedScriptValueCocoa.mm */,
</span><span class="cx"> 7CEFA9601AC0999300B910FD /* APIUserContentExtensionStoreCocoa.mm */,
</span><span class="cx"> 1A3635AB1A3145E500ED6197 /* APIWebsiteDataStoreCocoa.mm */,
</span><span class="lines">@@ -5051,6 +5064,7 @@
</span><span class="cx"> 75A8D2C4187CCF9F00C39C9E /* WKWebsiteDataStore.h */,
</span><span class="cx"> 75A8D2C5187CCF9F00C39C9E /* WKWebsiteDataStore.mm */,
</span><span class="cx"> 75A8D2D4187D1C0100C39C9E /* WKWebsiteDataStoreInternal.h */,
</span><ins>+ 1AE286791C7F7BA60069AC4F /* WKWebsiteDataStorePrivate.h */,
</ins><span class="cx"> 1A3CC16518906ACF001E6ED8 /* WKWebView.h */,
</span><span class="cx"> 1A3CC16418906ACF001E6ED8 /* WKWebView.mm */,
</span><span class="cx"> 1ADF59191890528E0043C145 /* WKWebViewConfiguration.h */,
</span><span class="lines">@@ -5895,6 +5909,8 @@
</span><span class="cx"> BC032DC410F4387C0058C15A /* API */ = {
</span><span class="cx"> isa = PBXGroup;
</span><span class="cx"> children = (
</span><ins>+ 1AE286811C7F93860069AC4F /* APIWebsiteDataRecord.cpp */,
+ 1AE286821C7F93860069AC4F /* APIWebsiteDataRecord.h */,
</ins><span class="cx"> BC0C376610F807660076D7CB /* C */,
</span><span class="cx"> 37C4C08318149C2A003688B9 /* Cocoa */,
</span><span class="cx"> BC8A501311765F4500757573 /* cpp */,
</span><span class="lines">@@ -5941,8 +5957,6 @@
</span><span class="cx"> 7C89D2921A67122F003A5FDE /* APIUserScript.h */,
</span><span class="cx"> 2D8786211BDB58FF00D02ABB /* APIUserStyleSheet.cpp */,
</span><span class="cx"> 2D8786221BDB58FF00D02ABB /* APIUserStyleSheet.h */,
</span><del>- 1A4832C51A9BC13C008B4DFE /* APIWebsiteDataRecord.cpp */,
- 1A4832C61A9BC13C008B4DFE /* APIWebsiteDataRecord.h */,
</del><span class="cx"> 1A3635A71A3144A300ED6197 /* APIWebsiteDataStore.cpp */,
</span><span class="cx"> 1A3635A81A3144A300ED6197 /* APIWebsiteDataStore.h */,
</span><span class="cx"> 1A6563E21B7A8C50009CF787 /* APIWindowFeatures.cpp */,
</span><span class="lines">@@ -7122,6 +7136,7 @@
</span><span class="cx"> 93E6A4EE1BC5DD3900F8A0E7 /* _WKHitTestResult.h in Headers */,
</span><span class="cx"> 93A88B3B1BC710D900ABA5C2 /* _WKHitTestResultInternal.h in Headers */,
</span><span class="cx"> 37A64E5518F38E3C00EB30F1 /* _WKInputDelegate.h in Headers */,
</span><ins>+ 1AE2867A1C7F7BA60069AC4F /* WKWebsiteDataStorePrivate.h in Headers */,
</ins><span class="cx"> 9955A6EF1C79810800EB6A93 /* Automation.json in Headers */,
</span><span class="cx"> 2D790A9D1AD7050D00AB90B3 /* _WKLayoutMode.h in Headers */,
</span><span class="cx"> A118A9F31908B8EA00F7C92B /* _WKNSFileManagerExtras.h in Headers */,
</span><span class="lines">@@ -7204,7 +7219,6 @@
</span><span class="cx"> 2D8786241BDB58FF00D02ABB /* APIUserStyleSheet.h in Headers */,
</span><span class="cx"> C5E1AFED16B21017006CC1F2 /* APIWebArchive.h in Headers */,
</span><span class="cx"> C5E1AFEF16B21029006CC1F2 /* APIWebArchiveResource.h in Headers */,
</span><del>- 1A4832C81A9BC13C008B4DFE /* APIWebsiteDataRecord.h in Headers */,
</del><span class="cx"> C5BCE5DF1C50766A00CDE3FA /* InteractionInformationAtPosition.h in Headers */,
</span><span class="cx"> 1A3635AA1A3144A300ED6197 /* APIWebsiteDataStore.h in Headers */,
</span><span class="cx"> 1A6563E51B7A8C50009CF787 /* APIWindowFeatures.h in Headers */,
</span><span class="lines">@@ -7335,6 +7349,7 @@
</span><span class="cx"> 1ABC3DF61899E437004F0626 /* NavigationState.h in Headers */,
</span><span class="cx"> 1A6FBA2A11E6862700DB1371 /* NetscapeBrowserFuncs.h in Headers */,
</span><span class="cx"> 990D28AB1C6420C600986977 /* _WKAutomationSession.h in Headers */,
</span><ins>+ 1AE286801C7F92C00069AC4F /* _WKWebsiteDataSizeInternal.h in Headers */,
</ins><span class="cx"> 1A6FBD2811E69BC200DB1371 /* NetscapePlugin.h in Headers */,
</span><span class="cx"> 1A4A9C5612B816CF008FE984 /* NetscapePluginModule.h in Headers */,
</span><span class="cx"> 1AA5889211EE70400061B882 /* NetscapePluginStream.h in Headers */,
</span><span class="lines">@@ -7858,6 +7873,7 @@
</span><span class="cx"> 37C4C0941814B3AF003688B9 /* WKNSArray.h in Headers */,
</span><span class="cx"> 373CEAD6185417AE008C363D /* WKNSData.h in Headers */,
</span><span class="cx"> 371A19421824D29300F32A5E /* WKNSDictionary.h in Headers */,
</span><ins>+ 1AE286781C7E76510069AC4F /* _WKWebsiteDataSize.h in Headers */,
</ins><span class="cx"> 372CAF0B1833FD910040AC27 /* WKNSError.h in Headers */,
</span><span class="cx"> 378E1A4A18208CD60031007A /* WKNSString.h in Headers */,
</span><span class="cx"> 378E1A4E18208D700031007A /* WKNSURL.h in Headers */,
</span><span class="lines">@@ -7879,6 +7895,7 @@
</span><span class="cx"> 1AB8A1F018400B0000E9AE69 /* WKPageFormClient.h in Headers */,
</span><span class="cx"> BC7B633712A45ABA00D174A4 /* WKPageGroup.h in Headers */,
</span><span class="cx"> 2D9EA30D1A96CB59002D2807 /* WKPageInjectedBundleClient.h in Headers */,
</span><ins>+ 1AE286841C7F93860069AC4F /* APIWebsiteDataRecord.h in Headers */,
</ins><span class="cx"> 1AB8A1EC1840080900E9AE69 /* WKPageLoaderClient.h in Headers */,
</span><span class="cx"> BC2D021912AC426C00E732A3 /* WKPageLoadTypes.h in Headers */,
</span><span class="cx"> 93BDEB01171DD7AF00BFEE1B /* WKPageLoadTypesPrivate.h in Headers */,
</span><span class="lines">@@ -8643,7 +8660,6 @@
</span><span class="cx"> 2D8786231BDB58FF00D02ABB /* APIUserStyleSheet.cpp in Sources */,
</span><span class="cx"> C5E1AFEC16B21012006CC1F2 /* APIWebArchive.mm in Sources */,
</span><span class="cx"> C5E1AFEE16B21025006CC1F2 /* APIWebArchiveResource.mm in Sources */,
</span><del>- 1A4832C71A9BC13C008B4DFE /* APIWebsiteDataRecord.cpp in Sources */,
</del><span class="cx"> 1A3635A91A3144A300ED6197 /* APIWebsiteDataStore.cpp in Sources */,
</span><span class="cx"> 1A3635AD1A3145E500ED6197 /* APIWebsiteDataStoreCocoa.mm in Sources */,
</span><span class="cx"> 1A6563E41B7A8C50009CF787 /* APIWindowFeatures.cpp in Sources */,
</span><span class="lines">@@ -8681,6 +8697,7 @@
</span><span class="cx"> B878B616133428DC006888E9 /* CorrectionPanel.mm in Sources */,
</span><span class="cx"> 2984F588164BA095004BC0C6 /* CustomProtocolManagerMessageReceiver.cpp in Sources */,
</span><span class="cx"> 29AD3096164B4C930072DEA9 /* CustomProtocolManagerProxyMac.mm in Sources */,
</span><ins>+ 1AE286831C7F93860069AC4F /* APIWebsiteDataRecord.cpp in Sources */,
</ins><span class="cx"> 2984F57C164B915F004BC0C6 /* CustomProtocolManagerProxyMessageReceiver.cpp in Sources */,
</span><span class="cx"> 51E351FF180F5D0F00E53BE9 /* DatabaseProcess.cpp in Sources */,
</span><span class="cx"> 515E772B184008B90007203F /* DatabaseProcessCreationParameters.cpp in Sources */,
</span><span class="lines">@@ -9247,6 +9264,7 @@
</span><span class="cx"> C57193BE18C14A44002D0F12 /* WKFormSelectControl.mm in Sources */,
</span><span class="cx"> C55CB5B818C2A5D600CA81E1 /* WKFormSelectPicker.mm in Sources */,
</span><span class="cx"> C55CB5B718C269CF00CA81E1 /* WKFormSelectPopover.mm in Sources */,
</span><ins>+ 1AE286771C7E76510069AC4F /* _WKWebsiteDataSize.mm in Sources */,
</ins><span class="cx"> BCE469591214EDF4000B98EB /* WKFormSubmissionListener.cpp in Sources */,
</span><span class="cx"> BCD0139C110FA420003B8A67 /* WKFrame.cpp in Sources */,
</span><span class="cx"> 1A4D664B18A3030E00D82E21 /* WKFrameInfo.mm in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebProcess.cpp (197202 => 197203)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2016-02-26 22:24:29 UTC (rev 197202)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2016-02-26 22:26:03 UTC (rev 197203)
</span><span class="lines">@@ -1117,7 +1117,7 @@
</span><span class="cx">
</span><span class="cx"> if (websiteDataTypes.contains(WebsiteDataType::MemoryCache)) {
</span><span class="cx"> for (auto& origin : MemoryCache::singleton().originsWithCache(sessionID))
</span><del>- websiteData.entries.append(WebsiteData::Entry { origin, WebsiteDataType::MemoryCache });
</del><ins>+ websiteData.entries.append(WebsiteData::Entry { origin, WebsiteDataType::MemoryCache, 0 });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> parentProcessConnection()->send(Messages::WebProcessProxy::DidFetchWebsiteData(callbackID, websiteData), 0);
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (197202 => 197203)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-02-26 22:24:29 UTC (rev 197202)
+++ trunk/Tools/ChangeLog 2016-02-26 22:26:03 UTC (rev 197203)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-02-26 Anders Carlsson <andersca@apple.com>
+
+ WKWebsiteDataStore/WKWebsiteDataRecord needs to provide size information about each type of data
+ https://bugs.webkit.org/show_bug.cgi?id=154750
+ rdar://problem/23861395
+
+ Reviewed by Tim Horton.
+
+ * MiniBrowser/mac/WK2BrowserWindowController.m:
+ (-[WK2BrowserWindowController fetchWebsiteData:]):
+ Use the new WKWebsiteDataStore SPI to compute data sizes.
+
</ins><span class="cx"> 2016-02-25 Gavin Barraclough <barraclough@apple.com>
</span><span class="cx">
</span><span class="cx"> RefCounter value changed callback should be called on all changes (not just zero edge).
</span></span></pre></div>
<a id="trunkToolsMiniBrowsermacWK2BrowserWindowControllerm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m (197202 => 197203)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m 2016-02-26 22:24:29 UTC (rev 197202)
+++ trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m 2016-02-26 22:26:03 UTC (rev 197203)
</span><span class="lines">@@ -35,6 +35,7 @@
</span><span class="cx"> #import <WebKit/WKUIDelegate.h>
</span><span class="cx"> #import <WebKit/WKWebViewConfigurationPrivate.h>
</span><span class="cx"> #import <WebKit/WKWebViewPrivate.h>
</span><ins>+#import <WebKit/WKWebsiteDataStorePrivate.h>
</ins><span class="cx"> #import <WebKit/WebNSURLExtras.h>
</span><span class="cx">
</span><span class="cx"> static void* keyValueObservingContext = &keyValueObservingContext;
</span><span class="lines">@@ -479,7 +480,7 @@
</span><span class="cx">
</span><span class="cx"> - (IBAction)fetchWebsiteData:(id)sender
</span><span class="cx"> {
</span><del>- [_configuration.websiteDataStore fetchDataRecordsOfTypes:dataTypes() completionHandler:^(NSArray *websiteDataRecords) {
</del><ins>+ [_configuration.websiteDataStore _fetchDataRecordsOfTypes:dataTypes() withOptions:_WKWebsiteDataStoreFetchOptionComputeSizes completionHandler:^(NSArray *websiteDataRecords) {
</ins><span class="cx"> NSLog(@"did fetch website data %@.", websiteDataRecords);
</span><span class="cx"> }];
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>