<!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>[182639] trunk/Source/WebKit2</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/182639">182639</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2015-04-10 12:39:57 -0700 (Fri, 10 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>_WKWebsiteDataStore doesn't track and remove offline application cache entries
https://bugs.webkit.org/show_bug.cgi?id=143614
rdar://problem/20243235
Reviewed by Andreas Kling.
* Shared/WebsiteData/WebsiteDataTypes.h:
Add WebsiteDataTypeOfflineWebApplicationCache.
* UIProcess/API/Cocoa/_WKWebsiteDataRecord.h:
* UIProcess/API/Cocoa/_WKWebsiteDataRecord.mm:
(dataTypesToString):
* UIProcess/API/Cocoa/_WKWebsiteDataRecordInternal.h:
(WebKit::toWebsiteDataTypes):
(WebKit::toWKWebsiteDataTypes):
Add WKWebsiteDataTypeOfflineWebApplicationCache.
* UIProcess/WebsiteData/WebsiteDataStore.cpp:
(WebKit::WebsiteDataStore::fetchData):
Create a custom application cache storage and fetch the origins from it.
(WebKit::WebsiteDataStore::removeData):
Delete either all the cache entries (since we don't track time in the application cache),
or the ones specified by the given entries.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedWebsiteDataWebsiteDataTypesh">trunk/Source/WebKit2/Shared/WebsiteData/WebsiteDataTypes.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoa_WKWebsiteDataRecordh">trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataRecord.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoa_WKWebsiteDataRecordmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataRecord.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoa_WKWebsiteDataRecordInternalh">trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataRecordInternal.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebsiteDataWebsiteDataStorecpp">trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (182638 => 182639)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-04-10 19:09:14 UTC (rev 182638)
+++ trunk/Source/WebKit2/ChangeLog 2015-04-10 19:39:57 UTC (rev 182639)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2015-04-10 Anders Carlsson <andersca@apple.com>
+
+ _WKWebsiteDataStore doesn't track and remove offline application cache entries
+ https://bugs.webkit.org/show_bug.cgi?id=143614
+ rdar://problem/20243235
+
+ Reviewed by Andreas Kling.
+
+ * Shared/WebsiteData/WebsiteDataTypes.h:
+ Add WebsiteDataTypeOfflineWebApplicationCache.
+
+ * UIProcess/API/Cocoa/_WKWebsiteDataRecord.h:
+ * UIProcess/API/Cocoa/_WKWebsiteDataRecord.mm:
+ (dataTypesToString):
+ * UIProcess/API/Cocoa/_WKWebsiteDataRecordInternal.h:
+ (WebKit::toWebsiteDataTypes):
+ (WebKit::toWKWebsiteDataTypes):
+ Add WKWebsiteDataTypeOfflineWebApplicationCache.
+
+ * UIProcess/WebsiteData/WebsiteDataStore.cpp:
+ (WebKit::WebsiteDataStore::fetchData):
+ Create a custom application cache storage and fetch the origins from it.
+
+ (WebKit::WebsiteDataStore::removeData):
+ Delete either all the cache entries (since we don't track time in the application cache),
+ or the ones specified by the given entries.
+
</ins><span class="cx"> 2015-04-10 Eric Carlson <eric.carlson@apple.com>
</span><span class="cx">
</span><span class="cx"> [Mac] Refactor MediaPlaybackTarget
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebsiteDataWebsiteDataTypesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebsiteData/WebsiteDataTypes.h (182638 => 182639)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebsiteData/WebsiteDataTypes.h 2015-04-10 19:09:14 UTC (rev 182638)
+++ trunk/Source/WebKit2/Shared/WebsiteData/WebsiteDataTypes.h 2015-04-10 19:39:57 UTC (rev 182639)
</span><span class="lines">@@ -32,8 +32,9 @@
</span><span class="cx"> WebsiteDataTypeCookies = 1 << 0,
</span><span class="cx"> WebsiteDataTypeDiskCache = 1 << 1,
</span><span class="cx"> WebsiteDataTypeMemoryCache = 1 << 2,
</span><del>- WebsiteDataTypeLocalStorage = 1 << 3,
- WebsiteDataTypeWebSQLDatabases = 1 << 4,
</del><ins>+ WebsiteDataTypeOfflineWebApplicationCache = 1 << 3,
+ WebsiteDataTypeLocalStorage = 1 << 4,
+ WebsiteDataTypeWebSQLDatabases = 1 << 5,
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoa_WKWebsiteDataRecordh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataRecord.h (182638 => 182639)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataRecord.h 2015-04-10 19:09:14 UTC (rev 182638)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataRecord.h 2015-04-10 19:39:57 UTC (rev 182639)
</span><span class="lines">@@ -33,9 +33,10 @@
</span><span class="cx"> WKWebsiteDataTypeCookies = 1 << 0,
</span><span class="cx"> WKWebsiteDataTypeDiskCache = 1 << 1,
</span><span class="cx"> WKWebsiteDataTypeMemoryCache = 1 << 2,
</span><ins>+ WKWebsiteDataTypeOfflineWebApplicationCache = 1 << 3,
</ins><span class="cx">
</span><del>- WKWebsiteDataTypeLocalStorage = 1 << 3,
- WKWebsiteDataTypeWebSQLDatabases = 1 << 4,
</del><ins>+ WKWebsiteDataTypeLocalStorage = 1 << 4,
+ WKWebsiteDataTypeWebSQLDatabases = 1 << 5,
</ins><span class="cx">
</span><span class="cx"> WKWebsiteDataTypeAll = NSUIntegerMax,
</span><span class="cx"> } WK_ENUM_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoa_WKWebsiteDataRecordmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataRecord.mm (182638 => 182639)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataRecord.mm 2015-04-10 19:09:14 UTC (rev 182638)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataRecord.mm 2015-04-10 19:39:57 UTC (rev 182639)
</span><span class="lines">@@ -47,6 +47,8 @@
</span><span class="cx"> [array addObject:@"Disk Cache"];
</span><span class="cx"> if (dataTypes & WKWebsiteDataTypeMemoryCache)
</span><span class="cx"> [array addObject:@"Memory Cache"];
</span><ins>+ if (dataTypes & WKWebsiteDataTypeOfflineWebApplicationCache)
+ [array addObject:@"Offline Web Application Cache"];
</ins><span class="cx"> if (dataTypes & WKWebsiteDataTypeLocalStorage)
</span><span class="cx"> [array addObject:@"Local Storage"];
</span><span class="cx"> if (dataTypes & WKWebsiteDataTypeWebSQLDatabases)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoa_WKWebsiteDataRecordInternalh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataRecordInternal.h (182638 => 182639)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataRecordInternal.h 2015-04-10 19:09:14 UTC (rev 182638)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataRecordInternal.h 2015-04-10 19:39:57 UTC (rev 182639)
</span><span class="lines">@@ -50,6 +50,8 @@
</span><span class="cx"> websiteDataTypes |= WebsiteDataTypes::WebsiteDataTypeDiskCache;
</span><span class="cx"> if (wkWebsiteDataTypes & WKWebsiteDataTypeMemoryCache)
</span><span class="cx"> websiteDataTypes |= WebsiteDataTypes::WebsiteDataTypeMemoryCache;
</span><ins>+ if (wkWebsiteDataTypes & WKWebsiteDataTypeOfflineWebApplicationCache)
+ websiteDataTypes |= WebsiteDataTypes::WebsiteDataTypeOfflineWebApplicationCache;
</ins><span class="cx"> if (wkWebsiteDataTypes & WKWebsiteDataTypeLocalStorage)
</span><span class="cx"> websiteDataTypes |= WebsiteDataTypes::WebsiteDataTypeLocalStorage;
</span><span class="cx"> if (wkWebsiteDataTypes & WKWebsiteDataTypeWebSQLDatabases)
</span><span class="lines">@@ -70,6 +72,8 @@
</span><span class="cx"> wkWebsiteDataTypes |= WKWebsiteDataTypeDiskCache;
</span><span class="cx"> if (websiteDataTypes & WebsiteDataTypes::WebsiteDataTypeMemoryCache)
</span><span class="cx"> wkWebsiteDataTypes |= WKWebsiteDataTypeMemoryCache;
</span><ins>+ if (websiteDataTypes & WebsiteDataTypes::WebsiteDataTypeOfflineWebApplicationCache)
+ wkWebsiteDataTypes |= WKWebsiteDataTypeOfflineWebApplicationCache;
</ins><span class="cx"> if (websiteDataTypes & WebsiteDataTypes::WebsiteDataTypeLocalStorage)
</span><span class="cx"> wkWebsiteDataTypes |= WKWebsiteDataTypeLocalStorage;
</span><span class="cx"> if (websiteDataTypes & WebsiteDataTypes::WebsiteDataTypeWebSQLDatabases)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebsiteDataWebsiteDataStorecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp (182638 => 182639)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp 2015-04-10 19:09:14 UTC (rev 182638)
+++ trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp 2015-04-10 19:39:57 UTC (rev 182639)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx"> #include "StorageManager.h"
</span><span class="cx"> #include "WebProcessPool.h"
</span><span class="cx"> #include "WebsiteData.h"
</span><ins>+#include <WebCore/ApplicationCacheStorage.h>
</ins><span class="cx"> #include <WebCore/DatabaseTracker.h>
</span><span class="cx"> #include <WebCore/OriginLock.h>
</span><span class="cx"> #include <wtf/RunLoop.h>
</span><span class="lines">@@ -277,6 +278,28 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (dataTypes & WebsiteDataTypeOfflineWebApplicationCache && !isNonPersistent()) {
+ StringCapture applicationCacheDirectory { m_applicationCacheDirectory };
+
+ callbackAggregator->addPendingCallback();
+
+ m_queue->dispatch([applicationCacheDirectory, callbackAggregator] {
+ auto storage = WebCore::ApplicationCacheStorage::create(applicationCacheDirectory.string(), "Files");
+
+ HashSet<RefPtr<WebCore::SecurityOrigin>> origins;
+ storage->getOriginsWithCache(origins);
+
+ WTF::RunLoop::main().dispatch([callbackAggregator, origins]() mutable {
+ WebsiteData websiteData;
+
+ for (auto& origin : origins)
+ websiteData.entries.append(WebsiteData::Entry { origin, WebsiteDataTypeOfflineWebApplicationCache });
+
+ callbackAggregator->removePendingCallback(WTF::move(websiteData));
+ });
+ });
+ }
+
</ins><span class="cx"> if (dataTypes & WebsiteDataTypeWebSQLDatabases && !isNonPersistent()) {
</span><span class="cx"> StringCapture webSQLDatabaseDirectory { m_webSQLDatabaseDirectory };
</span><span class="cx">
</span><span class="lines">@@ -286,7 +309,7 @@
</span><span class="cx"> Vector<RefPtr<WebCore::SecurityOrigin>> origins;
</span><span class="cx"> WebCore::DatabaseTracker::trackerWithDatabasePath(webSQLDatabaseDirectory.string())->origins(origins);
</span><span class="cx">
</span><del>- RunLoop::main().dispatch([webSQLDatabaseDirectory, callbackAggregator, origins]() mutable {
</del><ins>+ RunLoop::main().dispatch([callbackAggregator, origins]() mutable {
</ins><span class="cx"> WebsiteData websiteData;
</span><span class="cx"> for (auto& origin : origins)
</span><span class="cx"> websiteData.entries.append(WebsiteData::Entry { WTF::move(origin), WebsiteDataTypeWebSQLDatabases });
</span><span class="lines">@@ -422,6 +445,22 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (dataTypes & WebsiteDataTypeOfflineWebApplicationCache && !isNonPersistent()) {
+ StringCapture applicationCacheDirectory { m_applicationCacheDirectory };
+
+ callbackAggregator->addPendingCallback();
+
+ m_queue->dispatch([applicationCacheDirectory, callbackAggregator] {
+ auto storage = WebCore::ApplicationCacheStorage::create(applicationCacheDirectory.string(), "Files");
+
+ storage->deleteAllEntries();
+
+ WTF::RunLoop::main().dispatch([callbackAggregator] {
+ callbackAggregator->removePendingCallback();
+ });
+ });
+ }
+
</ins><span class="cx"> if (dataTypes & WebsiteDataTypeWebSQLDatabases && !isNonPersistent()) {
</span><span class="cx"> StringCapture webSQLDatabaseDirectory { m_webSQLDatabaseDirectory };
</span><span class="cx">
</span><span class="lines">@@ -548,6 +587,28 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (dataTypes & WebsiteDataTypeOfflineWebApplicationCache && !isNonPersistent()) {
+ StringCapture applicationCacheDirectory { m_applicationCacheDirectory };
+
+ HashSet<RefPtr<WebCore::SecurityOrigin>> origins;
+ for (const auto& dataRecord : dataRecords) {
+ for (const auto& origin : dataRecord.origins)
+ origins.add(origin);
+ }
+
+ callbackAggregator->addPendingCallback();
+ m_queue->dispatch([origins, applicationCacheDirectory, callbackAggregator] {
+ auto storage = WebCore::ApplicationCacheStorage::create(applicationCacheDirectory.string(), "Files");
+
+ for (const auto& origin : origins)
+ storage->deleteCacheForOrigin(*origin);
+
+ WTF::RunLoop::main().dispatch([callbackAggregator] {
+ callbackAggregator->removePendingCallback();
+ });
+ });
+ }
+
</ins><span class="cx"> if (dataTypes & WebsiteDataTypeWebSQLDatabases && !isNonPersistent()) {
</span><span class="cx"> StringCapture webSQLDatabaseDirectory { m_webSQLDatabaseDirectory };
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>