<!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>[181837] 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/181837">181837</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2015-03-22 15:50:23 -0700 (Sun, 22 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>_WKWebsiteDataStore should clear WebSQL databases
https://bugs.webkit.org/show_bug.cgi?id=142947
Source/WebCore:
Reviewed by Sam Weinig.
* Modules/webdatabase/DatabaseTracker.cpp:
(WebCore::DatabaseTracker::trackerWithDatabasePath):
Add a hack so we can get at a tracker from the UI process.
(WebCore::DatabaseTracker::deleteDatabasesModifiedSince):
New function that deletes all databases modified after a given time.
* Modules/webdatabase/DatabaseTracker.h:
Add new members and export the ones we want to call from WebKit2.
* Modules/webdatabase/OriginLock.h:
Export the destructor.
Source/WebKit2:
rdar://problem/20242174
Reviewed by Sam Weinig.
* Shared/WebsiteData/WebsiteDataTypes.h:
Add WebsiteDataTypeWebSQLDatabases.
* UIProcess/API/Cocoa/APIWebsiteDataStoreCocoa.mm:
(API::WebsiteDataStore::defaultDataStoreConfiguration):
Initialize configuration.webSQLDatabaseDirectory.
* UIProcess/API/Cocoa/_WKWebsiteDataRecord.h:
Add WKWebsiteDataTypeWebSQLDatabases.
* UIProcess/API/Cocoa/_WKWebsiteDataRecord.mm:
(dataTypesToString):
Handle WKWebsiteDataTypeWebSQLDatabases.
* UIProcess/API/Cocoa/_WKWebsiteDataRecordInternal.h:
(WebKit::toWebsiteDataTypes):
(WebKit::toWKWebsiteDataTypes):
Handle WKWebsiteDataTypeWebSQLDatabases and WebsiteDataTypes::WebsiteDataTypeWebSQLDatabases.
* UIProcess/WebsiteData/WebsiteDataStore.cpp:
(WebKit::WebsiteDataStore::WebsiteDataStore):
Initialize m_webSQLDatabaseDirectory and add a queue member variable.
(WebKit::WebsiteDataStore::fetchData):
Fetch database origins.
(WebKit::WebsiteDataStore::removeData):
Remove databases.
* UIProcess/WebsiteData/WebsiteDataStore.h:
Add new members.
Tools:
Reviewed by Sam Weinig.
Add a variable that keeps track of the types of data we want to operate on, for easier debugging.
* MiniBrowser/mac/WK2BrowserWindowController.m:
(-[WK2BrowserWindowController fetchWebsiteData:]):
(-[WK2BrowserWindowController fetchAndClearWebsiteData:]):
(-[WK2BrowserWindowController clearWebsiteData:]):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseDatabaseTrackercpp">trunk/Source/WebCore/Modules/webdatabase/DatabaseTracker.cpp</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseDatabaseTrackerh">trunk/Source/WebCore/Modules/webdatabase/DatabaseTracker.h</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseOriginLockh">trunk/Source/WebCore/Modules/webdatabase/OriginLock.h</a></li>
<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="#trunkSourceWebKit2UIProcessAPICocoaAPIWebsiteDataStoreCocoamm">trunk/Source/WebKit2/UIProcess/API/Cocoa/APIWebsiteDataStoreCocoa.mm</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>
<li><a href="#trunkSourceWebKit2UIProcessWebsiteDataWebsiteDataStoreh">trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.h</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsMiniBrowsermacWK2BrowserWindowControllerm">trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (181836 => 181837)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-03-22 21:44:50 UTC (rev 181836)
+++ trunk/Source/WebCore/ChangeLog 2015-03-22 22:50:23 UTC (rev 181837)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2015-03-22 Anders Carlsson <andersca@apple.com>
+
+ _WKWebsiteDataStore should clear WebSQL databases
+ https://bugs.webkit.org/show_bug.cgi?id=142947
+
+ Reviewed by Sam Weinig.
+
+ * Modules/webdatabase/DatabaseTracker.cpp:
+ (WebCore::DatabaseTracker::trackerWithDatabasePath):
+ Add a hack so we can get at a tracker from the UI process.
+
+ (WebCore::DatabaseTracker::deleteDatabasesModifiedSince):
+ New function that deletes all databases modified after a given time.
+
+ * Modules/webdatabase/DatabaseTracker.h:
+ Add new members and export the ones we want to call from WebKit2.
+
+ * Modules/webdatabase/OriginLock.h:
+ Export the destructor.
+
</ins><span class="cx"> 2015-03-21 Dean Jackson <dino@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove the prefix for CSS Transforms
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseDatabaseTrackercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/DatabaseTracker.cpp (181836 => 181837)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/DatabaseTracker.cpp 2015-03-22 21:44:50 UTC (rev 181836)
+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseTracker.cpp 2015-03-22 22:50:23 UTC (rev 181837)
</span><span class="lines">@@ -56,6 +56,11 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><ins>+std::unique_ptr<DatabaseTracker> DatabaseTracker::trackerWithDatabasePath(const String& databasePath)
+{
+ return std::unique_ptr<DatabaseTracker>(new DatabaseTracker(databasePath));
+}
+
</ins><span class="cx"> static DatabaseTracker* staticTracker = 0;
</span><span class="cx">
</span><span class="cx"> void DatabaseTracker::initializeTracker(const String& databasePath)
</span><span class="lines">@@ -825,6 +830,31 @@
</span><span class="cx"> deleteOrigin(originsCopy[i].get());
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void DatabaseTracker::deleteDatabasesModifiedSince(std::chrono::system_clock::time_point time)
+{
+ Vector<RefPtr<SecurityOrigin>> originsCopy;
+ origins(originsCopy);
+
+ for (auto& origin : originsCopy) {
+ Vector<String> databaseNames;
+ if (!databaseNamesForOrigin(origin.get(), databaseNames))
+ continue;
+
+ for (auto& databaseName : databaseNames) {
+ auto fullPath = fullPathForDatabase(origin.get(), databaseName, false);
+
+ time_t modificationTime;
+ if (!getFileModificationTime(fullPath, modificationTime))
+ continue;
+
+ if (modificationTime < std::chrono::system_clock::to_time_t(time))
+ continue;
+
+ deleteDatabase(origin.get(), databaseName);
+ }
+ }
+}
+
</ins><span class="cx"> // It is the caller's responsibility to make sure that nobody is trying to create, delete, open, or close databases in this origin while the deletion is
</span><span class="cx"> // taking place.
</span><span class="cx"> bool DatabaseTracker::deleteOrigin(SecurityOrigin* origin)
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseDatabaseTrackerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/DatabaseTracker.h (181836 => 181837)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/DatabaseTracker.h 2015-03-22 21:44:50 UTC (rev 181836)
+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseTracker.h 2015-03-22 22:50:23 UTC (rev 181837)
</span><span class="lines">@@ -49,6 +49,9 @@
</span><span class="cx"> class DatabaseTracker {
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(DatabaseTracker); WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><ins>+ // FIXME: This is a hack so we can easily delete databases from the UI process in WebKit2.
+ WEBCORE_EXPORT static std::unique_ptr<DatabaseTracker> trackerWithDatabasePath(const String& databasePath);
+
</ins><span class="cx"> static void initializeTracker(const String& databasePath);
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT static DatabaseTracker& tracker();
</span><span class="lines">@@ -82,7 +85,7 @@
</span><span class="cx"> void setDatabaseDirectoryPath(const String&);
</span><span class="cx"> String databaseDirectoryPath() const;
</span><span class="cx">
</span><del>- void origins(Vector<RefPtr<SecurityOrigin>>& result);
</del><ins>+ WEBCORE_EXPORT void origins(Vector<RefPtr<SecurityOrigin>>& result);
</ins><span class="cx"> bool databaseNamesForOrigin(SecurityOrigin*, Vector<String>& result);
</span><span class="cx">
</span><span class="cx"> DatabaseDetails detailsForNameAndOrigin(const String&, SecurityOrigin*);
</span><span class="lines">@@ -93,7 +96,8 @@
</span><span class="cx"> PassRefPtr<OriginLock> originLockFor(SecurityOrigin*);
</span><span class="cx">
</span><span class="cx"> void deleteAllDatabases();
</span><del>- bool deleteOrigin(SecurityOrigin*);
</del><ins>+ WEBCORE_EXPORT void deleteDatabasesModifiedSince(std::chrono::system_clock::time_point);
+ WEBCORE_EXPORT bool deleteOrigin(SecurityOrigin*);
</ins><span class="cx"> bool deleteDatabase(SecurityOrigin*, const String& name);
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseOriginLockh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/OriginLock.h (181836 => 181837)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/OriginLock.h 2015-03-22 21:44:50 UTC (rev 181836)
+++ trunk/Source/WebCore/Modules/webdatabase/OriginLock.h 2015-03-22 22:50:23 UTC (rev 181837)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(OriginLock); WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><span class="cx"> OriginLock(String originPath);
</span><del>- ~OriginLock();
</del><ins>+ WEBCORE_EXPORT ~OriginLock();
</ins><span class="cx">
</span><span class="cx"> void lock();
</span><span class="cx"> void unlock();
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (181836 => 181837)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-03-22 21:44:50 UTC (rev 181836)
+++ trunk/Source/WebKit2/ChangeLog 2015-03-22 22:50:23 UTC (rev 181837)
</span><span class="lines">@@ -1,3 +1,43 @@
</span><ins>+2015-03-22 Anders Carlsson <andersca@apple.com>
+
+ _WKWebsiteDataStore should clear WebSQL databases
+ https://bugs.webkit.org/show_bug.cgi?id=142947
+ rdar://problem/20242174
+
+ Reviewed by Sam Weinig.
+
+ * Shared/WebsiteData/WebsiteDataTypes.h:
+ Add WebsiteDataTypeWebSQLDatabases.
+
+ * UIProcess/API/Cocoa/APIWebsiteDataStoreCocoa.mm:
+ (API::WebsiteDataStore::defaultDataStoreConfiguration):
+ Initialize configuration.webSQLDatabaseDirectory.
+
+ * UIProcess/API/Cocoa/_WKWebsiteDataRecord.h:
+ Add WKWebsiteDataTypeWebSQLDatabases.
+
+ * UIProcess/API/Cocoa/_WKWebsiteDataRecord.mm:
+ (dataTypesToString):
+ Handle WKWebsiteDataTypeWebSQLDatabases.
+
+ * UIProcess/API/Cocoa/_WKWebsiteDataRecordInternal.h:
+ (WebKit::toWebsiteDataTypes):
+ (WebKit::toWKWebsiteDataTypes):
+ Handle WKWebsiteDataTypeWebSQLDatabases and WebsiteDataTypes::WebsiteDataTypeWebSQLDatabases.
+
+ * UIProcess/WebsiteData/WebsiteDataStore.cpp:
+ (WebKit::WebsiteDataStore::WebsiteDataStore):
+ Initialize m_webSQLDatabaseDirectory and add a queue member variable.
+
+ (WebKit::WebsiteDataStore::fetchData):
+ Fetch database origins.
+
+ (WebKit::WebsiteDataStore::removeData):
+ Remove databases.
+
+ * UIProcess/WebsiteData/WebsiteDataStore.h:
+ Add new members.
+
</ins><span class="cx"> 2015-03-22 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] Expose WebPageProxy::setInitialFocus as SPI
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebsiteDataWebsiteDataTypesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebsiteData/WebsiteDataTypes.h (181836 => 181837)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebsiteData/WebsiteDataTypes.h 2015-03-22 21:44:50 UTC (rev 181836)
+++ trunk/Source/WebKit2/Shared/WebsiteData/WebsiteDataTypes.h 2015-03-22 22:50:23 UTC (rev 181837)
</span><span class="lines">@@ -33,6 +33,7 @@
</span><span class="cx"> WebsiteDataTypeDiskCache = 1 << 1,
</span><span class="cx"> WebsiteDataTypeMemoryCache = 1 << 2,
</span><span class="cx"> WebsiteDataTypeLocalStorage = 1 << 3,
</span><ins>+ WebsiteDataTypeWebSQLDatabases = 1 << 4,
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaAPIWebsiteDataStoreCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/APIWebsiteDataStoreCocoa.mm (181836 => 181837)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/APIWebsiteDataStoreCocoa.mm 2015-03-22 21:44:50 UTC (rev 181836)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/APIWebsiteDataStoreCocoa.mm 2015-03-22 22:50:23 UTC (rev 181837)
</span><span class="lines">@@ -65,6 +65,7 @@
</span><span class="cx"> WebKit::WebsiteDataStore::Configuration configuration;
</span><span class="cx">
</span><span class="cx"> configuration.localStorageDirectory = websiteDataDirectoryFileSystemRepresentation("LocalStorage");
</span><ins>+ configuration.webSQLDatabaseDirectory = websiteDataDirectoryFileSystemRepresentation("WebSQL");
</ins><span class="cx">
</span><span class="cx"> return configuration;
</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 (181836 => 181837)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataRecord.h 2015-03-22 21:44:50 UTC (rev 181836)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataRecord.h 2015-03-22 22:50:23 UTC (rev 181837)
</span><span class="lines">@@ -35,6 +35,8 @@
</span><span class="cx"> WKWebsiteDataTypeMemoryCache = 1 << 2,
</span><span class="cx">
</span><span class="cx"> WKWebsiteDataTypeLocalStorage = 1 << 3,
</span><ins>+ WKWebsiteDataTypeWebSQLDatabases = 1 << 4,
+
</ins><span class="cx"> WKWebsiteDataTypeAll = NSUIntegerMax,
</span><span class="cx"> } WK_ENUM_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoa_WKWebsiteDataRecordmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataRecord.mm (181836 => 181837)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataRecord.mm 2015-03-22 21:44:50 UTC (rev 181836)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataRecord.mm 2015-03-22 22:50:23 UTC (rev 181837)
</span><span class="lines">@@ -49,6 +49,8 @@
</span><span class="cx"> [array addObject:@"Memory Cache"];
</span><span class="cx"> if (dataTypes & WKWebsiteDataTypeLocalStorage)
</span><span class="cx"> [array addObject:@"Local Storage"];
</span><ins>+ if (dataTypes & WKWebsiteDataTypeWebSQLDatabases)
+ [array addObject:@"Web SQL"];
</ins><span class="cx">
</span><span class="cx"> return [array componentsJoinedByString:@", "];
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoa_WKWebsiteDataRecordInternalh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataRecordInternal.h (181836 => 181837)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataRecordInternal.h 2015-03-22 21:44:50 UTC (rev 181836)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataRecordInternal.h 2015-03-22 22:50:23 UTC (rev 181837)
</span><span class="lines">@@ -52,6 +52,8 @@
</span><span class="cx"> websiteDataTypes |= WebsiteDataTypes::WebsiteDataTypeMemoryCache;
</span><span class="cx"> if (wkWebsiteDataTypes & WKWebsiteDataTypeLocalStorage)
</span><span class="cx"> websiteDataTypes |= WebsiteDataTypes::WebsiteDataTypeLocalStorage;
</span><ins>+ if (wkWebsiteDataTypes & WKWebsiteDataTypeWebSQLDatabases)
+ websiteDataTypes |= WebsiteDataTypes::WebsiteDataTypeWebSQLDatabases;
</ins><span class="cx">
</span><span class="cx"> return static_cast<WebsiteDataTypes>(websiteDataTypes);
</span><span class="cx"> }
</span><span class="lines">@@ -70,6 +72,8 @@
</span><span class="cx"> wkWebsiteDataTypes |= WKWebsiteDataTypeMemoryCache;
</span><span class="cx"> if (websiteDataTypes & WebsiteDataTypes::WebsiteDataTypeLocalStorage)
</span><span class="cx"> wkWebsiteDataTypes |= WKWebsiteDataTypeLocalStorage;
</span><ins>+ if (websiteDataTypes & WebsiteDataTypes::WebsiteDataTypeWebSQLDatabases)
+ wkWebsiteDataTypes |= WKWebsiteDataTypeWebSQLDatabases;
</ins><span class="cx">
</span><span class="cx"> return wkWebsiteDataTypes;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebsiteDataWebsiteDataStorecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp (181836 => 181837)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp 2015-03-22 21:44:50 UTC (rev 181836)
+++ trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp 2015-03-22 22:50:23 UTC (rev 181837)
</span><span class="lines">@@ -30,6 +30,8 @@
</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/DatabaseTracker.h>
+#include <WebCore/OriginLock.h>
</ins><span class="cx"> #include <wtf/RunLoop.h>
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="lines">@@ -62,7 +64,9 @@
</span><span class="cx"> WebsiteDataStore::WebsiteDataStore(Configuration configuration)
</span><span class="cx"> : m_identifier(generateIdentifier())
</span><span class="cx"> , m_sessionID(WebCore::SessionID::defaultSessionID())
</span><ins>+ , m_webSQLDatabaseDirectory(WTF::move(configuration.webSQLDatabaseDirectory))
</ins><span class="cx"> , m_storageManager(StorageManager::create(WTF::move(configuration.localStorageDirectory)))
</span><ins>+ , m_queue(WorkQueue::create("com.apple.WebKit.WebsiteDataStore"))
</ins><span class="cx"> {
</span><span class="cx"> platformInitialize();
</span><span class="cx"> }
</span><span class="lines">@@ -70,6 +74,7 @@
</span><span class="cx"> WebsiteDataStore::WebsiteDataStore(WebCore::SessionID sessionID)
</span><span class="cx"> : m_identifier(generateIdentifier())
</span><span class="cx"> , m_sessionID(sessionID)
</span><ins>+ , m_queue(WorkQueue::create("com.apple.WebKit.WebsiteDataStore"))
</ins><span class="cx"> {
</span><span class="cx"> platformInitialize();
</span><span class="cx"> }
</span><span class="lines">@@ -270,6 +275,25 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (dataTypes & WebsiteDataTypeWebSQLDatabases && !isNonPersistent()) {
+ StringCapture webSQLDatabaseDirectory { m_webSQLDatabaseDirectory };
+
+ callbackAggregator->addPendingCallback();
+
+ m_queue->dispatch([webSQLDatabaseDirectory, callbackAggregator] {
+ Vector<RefPtr<WebCore::SecurityOrigin>> origins;
+ WebCore::DatabaseTracker::trackerWithDatabasePath(webSQLDatabaseDirectory.string())->origins(origins);
+
+ RunLoop::main().dispatch([webSQLDatabaseDirectory, callbackAggregator, origins]() mutable {
+ WebsiteData websiteData;
+ for (auto& origin : origins)
+ websiteData.entries.append(WebsiteData::Entry { WTF::move(origin), WebsiteDataTypeWebSQLDatabases });
+
+ callbackAggregator->removePendingCallback(WTF::move(websiteData));
+ });
+ });
+ }
+
</ins><span class="cx"> callbackAggregator->callIfNeeded();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -396,6 +420,20 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (dataTypes & WebsiteDataTypeWebSQLDatabases && !isNonPersistent()) {
+ StringCapture webSQLDatabaseDirectory { m_webSQLDatabaseDirectory };
+
+ callbackAggregator->addPendingCallback();
+
+ m_queue->dispatch([webSQLDatabaseDirectory, callbackAggregator, modifiedSince] {
+ WebCore::DatabaseTracker::trackerWithDatabasePath(webSQLDatabaseDirectory.string())->deleteDatabasesModifiedSince(modifiedSince);
+
+ RunLoop::main().dispatch([callbackAggregator] {
+ callbackAggregator->removePendingCallback();
+ });
+ });
+ }
+
</ins><span class="cx"> // There's a chance that we don't have any pending callbacks. If so, we want to dispatch the completion handler right away.
</span><span class="cx"> callbackAggregator->callIfNeeded();
</span><span class="cx"> }
</span><span class="lines">@@ -409,7 +447,7 @@
</span><span class="cx"> origins.append(origin);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- struct CallbackAggregator : public RefCounted<CallbackAggregator> {
</del><ins>+ struct CallbackAggregator : public ThreadSafeRefCounted<CallbackAggregator> {
</ins><span class="cx"> explicit CallbackAggregator (std::function<void ()> completionHandler)
</span><span class="cx"> : completionHandler(WTF::move(completionHandler))
</span><span class="cx"> {
</span><span class="lines">@@ -508,6 +546,28 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (dataTypes & WebsiteDataTypeWebSQLDatabases && !isNonPersistent()) {
+ StringCapture webSQLDatabaseDirectory { m_webSQLDatabaseDirectory };
+
+ 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, callbackAggregator, webSQLDatabaseDirectory] {
+ auto databaseTracker = WebCore::DatabaseTracker::trackerWithDatabasePath(webSQLDatabaseDirectory.string());
+
+ for (const auto& origin : origins)
+ databaseTracker->deleteOrigin(origin.get());
+
+ RunLoop::main().dispatch([callbackAggregator] {
+ callbackAggregator->removePendingCallback();
+ });
+ });
+ }
+
</ins><span class="cx"> // There's a chance that we don't have any pending callbacks. If so, we want to dispatch the completion handler right away.
</span><span class="cx"> callbackAggregator->callIfNeeded();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebsiteDataWebsiteDataStoreh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.h (181836 => 181837)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.h 2015-03-22 21:44:50 UTC (rev 181836)
+++ trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.h 2015-03-22 22:50:23 UTC (rev 181837)
</span><span class="lines">@@ -33,6 +33,7 @@
</span><span class="cx"> #include <wtf/HashSet.h>
</span><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="cx"> #include <wtf/RefPtr.h>
</span><ins>+#include <wtf/WorkQueue.h>
</ins><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="lines">@@ -44,6 +45,7 @@
</span><span class="cx"> class WebsiteDataStore : public RefCounted<WebsiteDataStore>, public WebProcessLifetimeObserver {
</span><span class="cx"> public:
</span><span class="cx"> struct Configuration {
</span><ins>+ String webSQLDatabaseDirectory;
</ins><span class="cx"> String localStorageDirectory;
</span><span class="cx"> };
</span><span class="cx"> static RefPtr<WebsiteDataStore> createNonPersistent();
</span><span class="lines">@@ -81,7 +83,10 @@
</span><span class="cx"> const uint64_t m_identifier;
</span><span class="cx"> const WebCore::SessionID m_sessionID;
</span><span class="cx">
</span><ins>+ const String m_webSQLDatabaseDirectory;
</ins><span class="cx"> const RefPtr<StorageManager> m_storageManager;
</span><ins>+
+ Ref<WorkQueue> m_queue;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (181836 => 181837)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-03-22 21:44:50 UTC (rev 181836)
+++ trunk/Tools/ChangeLog 2015-03-22 22:50:23 UTC (rev 181837)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-03-22 Anders Carlsson <andersca@apple.com>
+
+ _WKWebsiteDataStore should clear WebSQL databases
+ https://bugs.webkit.org/show_bug.cgi?id=142947
+
+ Reviewed by Sam Weinig.
+
+ Add a variable that keeps track of the types of data we want to operate on, for easier debugging.
+
+ * MiniBrowser/mac/WK2BrowserWindowController.m:
+ (-[WK2BrowserWindowController fetchWebsiteData:]):
+ (-[WK2BrowserWindowController fetchAndClearWebsiteData:]):
+ (-[WK2BrowserWindowController clearWebsiteData:]):
+
</ins><span class="cx"> 2015-03-20 Mark Hahnenberg <mhahnenb@gmail.com>
</span><span class="cx">
</span><span class="cx"> GCTimer should know keep track of nested GC phases
</span></span></pre></div>
<a id="trunkToolsMiniBrowsermacWK2BrowserWindowControllerm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m (181836 => 181837)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m 2015-03-22 21:44:50 UTC (rev 181836)
+++ trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m 2015-03-22 22:50:23 UTC (rev 181837)
</span><span class="lines">@@ -407,18 +407,20 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static const WKWebsiteDataTypes dataTypes = WKWebsiteDataTypeAll;
+
</ins><span class="cx"> - (IBAction)fetchWebsiteData:(id)sender
</span><span class="cx"> {
</span><del>- [_configuration._websiteDataStore fetchDataRecordsOfTypes:WKWebsiteDataTypeAll completionHandler:^(NSArray *websiteDataRecords) {
</del><ins>+ [_configuration._websiteDataStore fetchDataRecordsOfTypes:dataTypes completionHandler:^(NSArray *websiteDataRecords) {
</ins><span class="cx"> NSLog(@"did fetch website data %@.", websiteDataRecords);
</span><span class="cx"> }];
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (IBAction)fetchAndClearWebsiteData:(id)sender
</span><span class="cx"> {
</span><del>- [_configuration._websiteDataStore fetchDataRecordsOfTypes:WKWebsiteDataTypeAll completionHandler:^(NSArray *websiteDataRecords) {
- [_configuration._websiteDataStore removeDataOfTypes:WKWebsiteDataTypeAll forDataRecords:websiteDataRecords completionHandler:^{
- [_configuration._websiteDataStore fetchDataRecordsOfTypes:WKWebsiteDataTypeAll completionHandler:^(NSArray *websiteDataRecords) {
</del><ins>+ [_configuration._websiteDataStore fetchDataRecordsOfTypes:dataTypes completionHandler:^(NSArray *websiteDataRecords) {
+ [_configuration._websiteDataStore removeDataOfTypes:dataTypes forDataRecords:websiteDataRecords completionHandler:^{
+ [_configuration._websiteDataStore fetchDataRecordsOfTypes:dataTypes completionHandler:^(NSArray *websiteDataRecords) {
</ins><span class="cx"> NSLog(@"did clear website data, after clearing data is %@.", websiteDataRecords);
</span><span class="cx"> }];
</span><span class="cx"> }];
</span><span class="lines">@@ -427,7 +429,7 @@
</span><span class="cx">
</span><span class="cx"> - (IBAction)clearWebsiteData:(id)sender
</span><span class="cx"> {
</span><del>- [_configuration._websiteDataStore removeDataOfTypes:WKWebsiteDataTypeAll modifiedSince:[NSDate distantPast] completionHandler:^{
</del><ins>+ [_configuration._websiteDataStore removeDataOfTypes:dataTypes modifiedSince:[NSDate distantPast] completionHandler:^{
</ins><span class="cx"> NSLog(@"Did clear website data.");
</span><span class="cx"> }];
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>