<!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>[201081] 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/201081">201081</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2016-05-18 09:30:30 -0700 (Wed, 18 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Modern IDB: Make TestRunner.clearAllDatabases also delete IndexedDB databases (once doing so is supported).
https://bugs.webkit.org/show_bug.cgi?id=157823
Reviewed by Alex Christensen.
Source/WebCore:
No new tests (No current behavior change, will be tested with b/157626's resolution).
* Modules/indexeddb/server/IDBServer.cpp:
(WebCore::IDBServer::IDBServer::closeAndDeleteDatabasesModifiedSince): Stub this out for now.
* Modules/indexeddb/server/IDBServer.h:
* Modules/indexeddb/shared/InProcessIDBServer.h:
Source/WebKit:
* Storage/WebDatabaseProvider.cpp:
(WebDatabaseProvider::deleteAllDatabases):
* Storage/WebDatabaseProvider.h:
Source/WebKit/mac:
* Storage/WebDatabaseManager.mm:
(-[WebDatabaseManager deleteAllIndexedDatabases]):
* Storage/WebDatabaseManagerPrivate.h:
Source/WebKit2:
* CMakeLists.txt:
* UIProcess/API/C/WKWebsiteDataStoreRef.cpp:
(WKWebsiteDataStoreRemoveAllIndexedDatabases):
* UIProcess/API/C/WKWebsiteDataStoreRef.h:
Tools:
* DumpRenderTree/mac/TestRunnerMac.mm:
(TestRunner::clearAllDatabases):
* WebKitTestRunner/InjectedBundle/TestRunner.cpp:
(WTR::TestRunner::clearAllDatabases):
* WebKitTestRunner/TestInvocation.cpp:
(WTR::TestInvocation::didReceiveSynchronousMessageFromInjectedBundle):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbserverIDBServercpp">trunk/Source/WebCore/Modules/indexeddb/server/IDBServer.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbserverIDBServerh">trunk/Source/WebCore/Modules/indexeddb/server/IDBServer.h</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbsharedInProcessIDBServerh">trunk/Source/WebCore/Modules/indexeddb/shared/InProcessIDBServer.h</a></li>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitStorageWebDatabaseProvidercpp">trunk/Source/WebKit/Storage/WebDatabaseProvider.cpp</a></li>
<li><a href="#trunkSourceWebKitStorageWebDatabaseProviderh">trunk/Source/WebKit/Storage/WebDatabaseProvider.h</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacStorageWebDatabaseManagermm">trunk/Source/WebKit/mac/Storage/WebDatabaseManager.mm</a></li>
<li><a href="#trunkSourceWebKitmacStorageWebDatabaseManagerPrivateh">trunk/Source/WebKit/mac/Storage/WebDatabaseManagerPrivate.h</a></li>
<li><a href="#trunkSourceWebKit2CMakeListstxt">trunk/Source/WebKit2/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKWebsiteDataStoreRefcpp">trunk/Source/WebKit2/UIProcess/API/C/WKWebsiteDataStoreRef.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKWebsiteDataStoreRefh">trunk/Source/WebKit2/UIProcess/API/C/WKWebsiteDataStoreRef.h</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsDumpRenderTreemacTestRunnerMacmm">trunk/Tools/DumpRenderTree/mac/TestRunnerMac.mm</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundleTestRunnercpp">trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp</a></li>
<li><a href="#trunkToolsWebKitTestRunnerTestInvocationcpp">trunk/Tools/WebKitTestRunner/TestInvocation.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (201080 => 201081)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-05-18 15:22:37 UTC (rev 201080)
+++ trunk/Source/WebCore/ChangeLog 2016-05-18 16:30:30 UTC (rev 201081)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-05-18 Brady Eidson <beidson@apple.com>
+
+ Modern IDB: Make TestRunner.clearAllDatabases also delete IndexedDB databases (once doing so is supported).
+ https://bugs.webkit.org/show_bug.cgi?id=157823
+
+ Reviewed by Alex Christensen.
+
+ No new tests (No current behavior change, will be tested with b/157626's resolution).
+
+ * Modules/indexeddb/server/IDBServer.cpp:
+ (WebCore::IDBServer::IDBServer::closeAndDeleteDatabasesModifiedSince): Stub this out for now.
+ * Modules/indexeddb/server/IDBServer.h:
+ * Modules/indexeddb/shared/InProcessIDBServer.h:
+
</ins><span class="cx"> 2016-05-18 Youenn Fablet <youenn.fablet@crf.canon.fr>
</span><span class="cx">
</span><span class="cx"> Sync DOM exception types with WebIDL and update promise rejections
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbserverIDBServercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/server/IDBServer.cpp (201080 => 201081)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/server/IDBServer.cpp 2016-05-18 15:22:37 UTC (rev 201080)
+++ trunk/Source/WebCore/Modules/indexeddb/server/IDBServer.cpp 2016-05-18 16:30:30 UTC (rev 201081)
</span><span class="lines">@@ -468,6 +468,12 @@
</span><span class="cx"> task->performTask();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void IDBServer::closeAndDeleteDatabasesModifiedSince(std::chrono::system_clock::time_point, std::function<void ()> completionHandler)
+{
+ // FIXME: Implement (https://bugs.webkit.org/show_bug.cgi?id=157626)
+ completionHandler();
+}
+
</ins><span class="cx"> } // namespace IDBServer
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbserverIDBServerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/server/IDBServer.h (201080 => 201081)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/server/IDBServer.h 2016-05-18 15:22:37 UTC (rev 201080)
+++ trunk/Source/WebCore/Modules/indexeddb/server/IDBServer.h 2016-05-18 16:30:30 UTC (rev 201081)
</span><span class="lines">@@ -96,6 +96,8 @@
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<IDBBackingStore> createBackingStore(const IDBDatabaseIdentifier&);
</span><span class="cx">
</span><ins>+ WEBCORE_EXPORT void closeAndDeleteDatabasesModifiedSince(std::chrono::system_clock::time_point, std::function<void ()> completionHandler);
+
</ins><span class="cx"> private:
</span><span class="cx"> IDBServer(IDBBackingStoreTemporaryFileHandler&);
</span><span class="cx"> IDBServer(const String& databaseDirectoryPath, IDBBackingStoreTemporaryFileHandler&);
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbsharedInProcessIDBServerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/shared/InProcessIDBServer.h (201080 => 201081)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/shared/InProcessIDBServer.h 2016-05-18 15:22:37 UTC (rev 201080)
+++ trunk/Source/WebCore/Modules/indexeddb/shared/InProcessIDBServer.h 2016-05-18 16:30:30 UTC (rev 201081)
</span><span class="lines">@@ -53,6 +53,8 @@
</span><span class="cx"> WEBCORE_EXPORT IDBClient::IDBConnectionToServer& connectionToServer() const;
</span><span class="cx"> IDBServer::IDBConnectionToClient& connectionToClient() const;
</span><span class="cx">
</span><ins>+ IDBServer::IDBServer& idbServer() { return m_server.get(); }
+
</ins><span class="cx"> // IDBConnectionToServer
</span><span class="cx"> void deleteDatabase(const IDBRequestData&) final;
</span><span class="cx"> void openDatabase(const IDBRequestData&) final;
</span></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (201080 => 201081)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog 2016-05-18 15:22:37 UTC (rev 201080)
+++ trunk/Source/WebKit/ChangeLog 2016-05-18 16:30:30 UTC (rev 201081)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-05-18 Brady Eidson <beidson@apple.com>
+
+ Modern IDB: Make TestRunner.clearAllDatabases also delete IndexedDB databases (once doing so is supported).
+ https://bugs.webkit.org/show_bug.cgi?id=157823
+
+ Reviewed by Alex Christensen.
+
+ * Storage/WebDatabaseProvider.cpp:
+ (WebDatabaseProvider::deleteAllDatabases):
+ * Storage/WebDatabaseProvider.h:
+
</ins><span class="cx"> 2016-04-25 Per Arne Vollan <peavo@outlook.com>
</span><span class="cx">
</span><span class="cx"> [Win][IndexedDB] Fix build errors.
</span></span></pre></div>
<a id="trunkSourceWebKitStorageWebDatabaseProvidercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/Storage/WebDatabaseProvider.cpp (201080 => 201081)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/Storage/WebDatabaseProvider.cpp 2016-05-18 15:22:37 UTC (rev 201080)
+++ trunk/Source/WebKit/Storage/WebDatabaseProvider.cpp 2016-05-18 16:30:30 UTC (rev 201081)
</span><span class="lines">@@ -56,4 +56,10 @@
</span><span class="cx">
</span><span class="cx"> return result.iterator->value->connectionToServer();
</span><span class="cx"> }
</span><ins>+
+void WebDatabaseProvider::deleteAllDatabases()
+{
+ for (auto& server : m_idbServerMap.values())
+ server->idbServer().closeAndDeleteDatabasesModifiedSince(std::chrono::system_clock::time_point::min(), [] { });
+}
</ins><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKitStorageWebDatabaseProviderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/Storage/WebDatabaseProvider.h (201080 => 201081)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/Storage/WebDatabaseProvider.h 2016-05-18 15:22:37 UTC (rev 201080)
+++ trunk/Source/WebKit/Storage/WebDatabaseProvider.h 2016-05-18 16:30:30 UTC (rev 201081)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2015 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2015, 2016 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -23,8 +23,7 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef WebDatabaseProvider_h
-#define WebDatabaseProvider_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #include <WebCore/DatabaseProvider.h>
</span><span class="cx"> #include <wtf/Forward.h>
</span><span class="lines">@@ -43,6 +42,8 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(INDEXED_DATABASE)
</span><span class="cx"> WebCore::IDBClient::IDBConnectionToServer& idbConnectionToServerForSession(const WebCore::SessionID&) override;
</span><ins>+
+ void deleteAllDatabases();
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="lines">@@ -54,5 +55,3 @@
</span><span class="cx"> HashMap<uint64_t, RefPtr<WebCore::InProcessIDBServer>> m_idbServerMap;
</span><span class="cx"> #endif
</span><span class="cx"> };
</span><del>-
-#endif // WebDatabaseProvider_h
</del></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (201080 => 201081)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2016-05-18 15:22:37 UTC (rev 201080)
+++ trunk/Source/WebKit/mac/ChangeLog 2016-05-18 16:30:30 UTC (rev 201081)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-05-18 Brady Eidson <beidson@apple.com>
+
+ Modern IDB: Make TestRunner.clearAllDatabases also delete IndexedDB databases (once doing so is supported).
+ https://bugs.webkit.org/show_bug.cgi?id=157823
+
+ Reviewed by Alex Christensen.
+
+ * Storage/WebDatabaseManager.mm:
+ (-[WebDatabaseManager deleteAllIndexedDatabases]):
+ * Storage/WebDatabaseManagerPrivate.h:
+
</ins><span class="cx"> 2016-05-17 Beth Dakin <bdakin@apple.com>
</span><span class="cx">
</span><span class="cx"> Make handleAcceptedCandidate a public function
</span></span></pre></div>
<a id="trunkSourceWebKitmacStorageWebDatabaseManagermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Storage/WebDatabaseManager.mm (201080 => 201081)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Storage/WebDatabaseManager.mm 2016-05-18 15:22:37 UTC (rev 201080)
+++ trunk/Source/WebKit/mac/Storage/WebDatabaseManager.mm 2016-05-18 16:30:30 UTC (rev 201081)
</span><span class="lines">@@ -36,6 +36,10 @@
</span><span class="cx"> #import <WebCore/SecurityOrigin.h>
</span><span class="cx"> #import <wtf/NeverDestroyed.h>
</span><span class="cx">
</span><ins>+#if ENABLE(INDEXED_DATABASE)
+#import "WebDatabaseProvider.h"
+#endif
+
</ins><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> #import "WebDatabaseManagerInternal.h"
</span><span class="cx"> #import <WebCore/DatabaseTracker.h>
</span><span class="lines">@@ -151,6 +155,14 @@
</span><span class="cx"> return DatabaseManager::singleton().deleteDatabase([origin _core], databaseIdentifier);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+// For DumpRenderTree support only
+- (void)deleteAllIndexedDatabases
+{
+#if ENABLE(INDEXED_DATABASE)
+ WebDatabaseProvider::singleton().deleteAllDatabases();
+#endif
+}
+
</ins><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> static bool isFileHidden(NSString *file)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebKitmacStorageWebDatabaseManagerPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Storage/WebDatabaseManagerPrivate.h (201080 => 201081)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Storage/WebDatabaseManagerPrivate.h 2016-05-18 15:22:37 UTC (rev 201080)
+++ trunk/Source/WebKit/mac/Storage/WebDatabaseManagerPrivate.h 2016-05-18 16:30:30 UTC (rev 201081)
</span><span class="lines">@@ -68,6 +68,9 @@
</span><span class="cx"> - (BOOL)deleteOrigin:(WebSecurityOrigin *)origin;
</span><span class="cx"> - (BOOL)deleteDatabase:(NSString *)databaseIdentifier withOrigin:(WebSecurityOrigin *)origin;
</span><span class="cx">
</span><ins>+// For DumpRenderTree support only
+- (void)deleteAllIndexedDatabases;
+
</ins><span class="cx"> #if TARGET_OS_IPHONE
</span><span class="cx"> + (void)scheduleEmptyDatabaseRemoval;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2CMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/CMakeLists.txt (201080 => 201081)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/CMakeLists.txt 2016-05-18 15:22:37 UTC (rev 201080)
+++ trunk/Source/WebKit2/CMakeLists.txt 2016-05-18 16:30:30 UTC (rev 201081)
</span><span class="lines">@@ -462,6 +462,7 @@
</span><span class="cx"> UIProcess/API/C/WKUserMediaPermissionRequest.cpp
</span><span class="cx"> UIProcess/API/C/WKVibration.cpp
</span><span class="cx"> UIProcess/API/C/WKViewportAttributes.cpp
</span><ins>+ UIProcess/API/C/WKWebsiteDataStoreRef.cpp
</ins><span class="cx"> UIProcess/API/C/WKWindowFeaturesRef.cpp
</span><span class="cx">
</span><span class="cx"> UIProcess/Authentication/AuthenticationChallengeProxy.cpp
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (201080 => 201081)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-05-18 15:22:37 UTC (rev 201080)
+++ trunk/Source/WebKit2/ChangeLog 2016-05-18 16:30:30 UTC (rev 201081)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-05-18 Brady Eidson <beidson@apple.com>
+
+ Modern IDB: Make TestRunner.clearAllDatabases also delete IndexedDB databases (once doing so is supported).
+ https://bugs.webkit.org/show_bug.cgi?id=157823
+
+ Reviewed by Alex Christensen.
+
+ * CMakeLists.txt:
+ * UIProcess/API/C/WKWebsiteDataStoreRef.cpp:
+ (WKWebsiteDataStoreRemoveAllIndexedDatabases):
+ * UIProcess/API/C/WKWebsiteDataStoreRef.h:
+
</ins><span class="cx"> 2016-05-18 Brian Burg <bburg@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION(r200959): "Start Timeline Recording" menu item doesn't start recording
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKWebsiteDataStoreRefcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKWebsiteDataStoreRef.cpp (201080 => 201081)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKWebsiteDataStoreRef.cpp 2016-05-18 15:22:37 UTC (rev 201080)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKWebsiteDataStoreRef.cpp 2016-05-18 16:30:30 UTC (rev 201081)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #include "APIWebsiteDataStore.h"
</span><span class="cx"> #include "WKAPICast.h"
</span><ins>+#include "WebsiteDataType.h"
</ins><span class="cx">
</span><span class="cx"> WKTypeID WKWebsiteDataStoreGetTypeID()
</span><span class="cx"> {
</span><span class="lines">@@ -54,3 +55,8 @@
</span><span class="cx"> return WebKit::toImpl(dataStoreRef)->resourceLoadStatisticsEnabled();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WKWebsiteDataStoreRemoveAllIndexedDatabases(WKWebsiteDataStoreRef dataStoreRef)
+{
+ OptionSet<WebKit::WebsiteDataType> dataTypes = WebKit::WebsiteDataType::IndexedDBDatabases;
+ WebKit::toImpl(dataStoreRef)->websiteDataStore().removeData(dataTypes, std::chrono::system_clock::time_point::min(), [] { });
+}
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKWebsiteDataStoreRefh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKWebsiteDataStoreRef.h (201080 => 201081)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKWebsiteDataStoreRef.h 2016-05-18 15:22:37 UTC (rev 201080)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKWebsiteDataStoreRef.h 2016-05-18 16:30:30 UTC (rev 201081)
</span><span class="lines">@@ -39,6 +39,7 @@
</span><span class="cx">
</span><span class="cx"> WK_EXPORT bool WKWebsiteDataStoreGetResourceLoadStatisticsEnabled(WKWebsiteDataStoreRef dataStoreRef);
</span><span class="cx"> WK_EXPORT void WKWebsiteDataStoreSetResourceLoadStatisticsEnabled(WKWebsiteDataStoreRef dataStoreRef, bool enable);
</span><ins>+WK_EXPORT void WKWebsiteDataStoreRemoveAllIndexedDatabases(WKWebsiteDataStoreRef dataStoreRef);
</ins><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (201080 => 201081)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-05-18 15:22:37 UTC (rev 201080)
+++ trunk/Tools/ChangeLog 2016-05-18 16:30:30 UTC (rev 201081)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2016-05-18 Brady Eidson <beidson@apple.com>
+
+ Modern IDB: Make TestRunner.clearAllDatabases also delete IndexedDB databases (once doing so is supported).
+ https://bugs.webkit.org/show_bug.cgi?id=157823
+
+ Reviewed by Alex Christensen.
+
+ * DumpRenderTree/mac/TestRunnerMac.mm:
+ (TestRunner::clearAllDatabases):
+
+ * WebKitTestRunner/InjectedBundle/TestRunner.cpp:
+ (WTR::TestRunner::clearAllDatabases):
+
+ * WebKitTestRunner/TestInvocation.cpp:
+ (WTR::TestInvocation::didReceiveSynchronousMessageFromInjectedBundle):
+
</ins><span class="cx"> 2016-05-18 Joanmarie Diggs <jdiggs@igalia.com>
</span><span class="cx">
</span><span class="cx"> AX: [ATK] Use WebCore Accessibility's AccessibilityText for AtkObject name and description
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreemacTestRunnerMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/mac/TestRunnerMac.mm (201080 => 201081)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/mac/TestRunnerMac.mm 2016-05-18 15:22:37 UTC (rev 201080)
+++ trunk/Tools/DumpRenderTree/mac/TestRunnerMac.mm 2016-05-18 16:30:30 UTC (rev 201081)
</span><span class="lines">@@ -197,6 +197,7 @@
</span><span class="cx"> void TestRunner::clearAllDatabases()
</span><span class="cx"> {
</span><span class="cx"> [[WebDatabaseManager sharedWebDatabaseManager] deleteAllDatabases];
</span><ins>+ [[WebDatabaseManager sharedWebDatabaseManager] deleteAllIndexedDatabases];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TestRunner::setStorageDatabaseIdleInterval(double interval)
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundleTestRunnercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp (201080 => 201081)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp 2016-05-18 15:22:37 UTC (rev 201080)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp 2016-05-18 16:30:30 UTC (rev 201081)
</span><span class="lines">@@ -252,6 +252,11 @@
</span><span class="cx"> void TestRunner::clearAllDatabases()
</span><span class="cx"> {
</span><span class="cx"> WKBundleClearAllDatabases(InjectedBundle::singleton().bundle());
</span><ins>+
+ WKRetainPtr<WKStringRef> messageName(AdoptWK, WKStringCreateWithUTF8CString("DeleteAllIndexedDatabases"));
+ WKRetainPtr<WKBooleanRef> messageBody(AdoptWK, WKBooleanCreate(true));
+
+ WKBundlePostSynchronousMessage(InjectedBundle::singleton().bundle(), messageName.get(), messageBody.get(), nullptr);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TestRunner::setDatabaseQuota(uint64_t quota)
</span><span class="lines">@@ -683,7 +688,7 @@
</span><span class="cx">
</span><span class="cx"> WKRetainPtr<WKBooleanRef> messageBody(AdoptWK, WKBooleanCreate(accept));
</span><span class="cx">
</span><del>- WKBundlePostSynchronousMessage(InjectedBundle::singleton().bundle(), messageName.get(), messageBody.get(), 0);
</del><ins>+ WKBundlePostSynchronousMessage(InjectedBundle::singleton().bundle(), messageName.get(), messageBody.get(), nullptr);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> double TestRunner::preciseTime()
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerTestInvocationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/TestInvocation.cpp (201080 => 201081)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/TestInvocation.cpp 2016-05-18 15:22:37 UTC (rev 201080)
+++ trunk/Tools/WebKitTestRunner/TestInvocation.cpp 2016-05-18 16:30:30 UTC (rev 201081)
</span><span class="lines">@@ -38,6 +38,7 @@
</span><span class="cx"> #include <WebKit/WKInspector.h>
</span><span class="cx"> #include <WebKit/WKPagePrivate.h>
</span><span class="cx"> #include <WebKit/WKRetainPtr.h>
</span><ins>+#include <WebKit/WKWebsiteDataStoreRef.h>
</ins><span class="cx"> #include <climits>
</span><span class="cx"> #include <cstdio>
</span><span class="cx"> #include <wtf/StdLibExtras.h>
</span><span class="lines">@@ -714,6 +715,11 @@
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (WKStringIsEqualToUTF8CString(messageName, "DeleteAllIndexedDatabases")) {
+ WKWebsiteDataStoreRemoveAllIndexedDatabases(WKContextGetWebsiteDataStore(TestController::singleton().context()));
+ return nullptr;
+ }
+
</ins><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>