<!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>[202368] 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/202368">202368</a></dd>
<dt>Author</dt> <dd>pvollan@apple.com</dd>
<dt>Date</dt> <dd>2016-06-22 23:33:07 -0700 (Wed, 22 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Win] The test storage/indexeddb/modern/handle-user-delete.html is timing out.
https://bugs.webkit.org/show_bug.cgi?id=158934
Reviewed by Brent Fulgham.
Source/WebKit/win:
Add a method to delete all indexed databases.
* Interfaces/IWebDatabaseManager.idl:
* WebDatabaseManager.cpp:
(WebDatabaseManager::QueryInterface):
(WebDatabaseManager::deleteAllIndexedDatabases):
* WebDatabaseManager.h:
Tools:
DumpRenderTree should also delete indexed databases when clearAllDatabases() is called.
* DumpRenderTree/win/TestRunnerWin.cpp:
(TestRunner::clearAllDatabases):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitwinChangeLog">trunk/Source/WebKit/win/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitwinInterfacesIWebDatabaseManageridl">trunk/Source/WebKit/win/Interfaces/IWebDatabaseManager.idl</a></li>
<li><a href="#trunkSourceWebKitwinWebDatabaseManagercpp">trunk/Source/WebKit/win/WebDatabaseManager.cpp</a></li>
<li><a href="#trunkSourceWebKitwinWebDatabaseManagerh">trunk/Source/WebKit/win/WebDatabaseManager.h</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsDumpRenderTreewinTestRunnerWincpp">trunk/Tools/DumpRenderTree/win/TestRunnerWin.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/ChangeLog (202367 => 202368)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/ChangeLog 2016-06-23 06:10:48 UTC (rev 202367)
+++ trunk/Source/WebKit/win/ChangeLog 2016-06-23 06:33:07 UTC (rev 202368)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-06-22 Per Arne Vollan <pvollan@apple.com>
+
+ [Win] The test storage/indexeddb/modern/handle-user-delete.html is timing out.
+ https://bugs.webkit.org/show_bug.cgi?id=158934
+
+ Reviewed by Brent Fulgham.
+
+ Add a method to delete all indexed databases.
+
+ * Interfaces/IWebDatabaseManager.idl:
+ * WebDatabaseManager.cpp:
+ (WebDatabaseManager::QueryInterface):
+ (WebDatabaseManager::deleteAllIndexedDatabases):
+ * WebDatabaseManager.h:
+
</ins><span class="cx"> 2016-06-17 Per Arne Vollan <pvollan@apple.com>
</span><span class="cx">
</span><span class="cx"> [Win] Rendering is not scaled correctly if process is DPI aware.
</span></span></pre></div>
<a id="trunkSourceWebKitwinInterfacesIWebDatabaseManageridl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/Interfaces/IWebDatabaseManager.idl (202367 => 202368)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/Interfaces/IWebDatabaseManager.idl 2016-06-23 06:10:48 UTC (rev 202367)
+++ trunk/Source/WebKit/win/Interfaces/IWebDatabaseManager.idl 2016-06-23 06:33:07 UTC (rev 202368)
</span><span class="lines">@@ -62,3 +62,11 @@
</span><span class="cx">
</span><span class="cx"> HRESULT setQuota([in] BSTR originName, [in] unsigned long long quota);
</span><span class="cx"> }
</span><ins>+
+[
+ uuid(759C2356-181C-4CCF-9E11-6F6242FB8C78)
+]
+interface IWebDatabaseManager2 : IWebDatabaseManager
+{
+ HRESULT deleteAllIndexedDatabases();
+}
</ins></span></pre></div>
<a id="trunkSourceWebKitwinWebDatabaseManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebDatabaseManager.cpp (202367 => 202368)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebDatabaseManager.cpp 2016-06-23 06:10:48 UTC (rev 202367)
+++ trunk/Source/WebKit/win/WebDatabaseManager.cpp 2016-06-23 06:33:07 UTC (rev 202368)
</span><span class="lines">@@ -42,6 +42,10 @@
</span><span class="cx"> #include <WebCore/SecurityOrigin.h>
</span><span class="cx"> #include <wtf/MainThread.h>
</span><span class="cx">
</span><ins>+#if ENABLE(INDEXED_DATABASE)
+#include "WebDatabaseProvider.h"
+#endif
+
</ins><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><span class="cx"> static CFStringRef WebDatabaseDirectoryDefaultsKey = CFSTR("WebDatabaseDirectory");
</span><span class="lines">@@ -174,6 +178,8 @@
</span><span class="cx"> *ppvObject = static_cast<WebDatabaseManager*>(this);
</span><span class="cx"> else if (IsEqualGUID(riid, IID_IWebDatabaseManager))
</span><span class="cx"> *ppvObject = static_cast<WebDatabaseManager*>(this);
</span><ins>+ else if (IsEqualGUID(riid, IID_IWebDatabaseManager2))
+ *ppvObject = static_cast<WebDatabaseManager*>(this);
</ins><span class="cx"> else
</span><span class="cx"> return E_NOINTERFACE;
</span><span class="cx">
</span><span class="lines">@@ -327,6 +333,14 @@
</span><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+HRESULT WebDatabaseManager::deleteAllIndexedDatabases()
+{
+#if ENABLE(INDEXED_DATABASE)
+ WebDatabaseProvider::singleton().deleteAllDatabases();
+#endif
+ return S_OK;
+}
+
</ins><span class="cx"> class DidModifyOriginData {
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(DidModifyOriginData);
</span><span class="cx"> public:
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebDatabaseManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebDatabaseManager.h (202367 => 202368)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebDatabaseManager.h 2016-06-23 06:10:48 UTC (rev 202367)
+++ trunk/Source/WebKit/win/WebDatabaseManager.h 2016-06-23 06:33:07 UTC (rev 202368)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx"> #include "WebKit.h"
</span><span class="cx"> #include <WebCore/DatabaseManagerClient.h>
</span><span class="cx">
</span><del>-class WebDatabaseManager : public IWebDatabaseManager, private WebCore::DatabaseManagerClient {
</del><ins>+class WebDatabaseManager : public IWebDatabaseManager2, private WebCore::DatabaseManagerClient {
</ins><span class="cx"> public:
</span><span class="cx"> static WebDatabaseManager* createInstance();
</span><span class="cx">
</span><span class="lines">@@ -51,6 +51,9 @@
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE deleteDatabase(_In_ BSTR databaseName, _In_opt_ IWebSecurityOrigin*);
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE setQuota(_In_ BSTR origin, unsigned long long quota);
</span><span class="cx">
</span><ins>+ // IWebDatabaseManager2
+ virtual HRESULT STDMETHODCALLTYPE deleteAllIndexedDatabases();
+
</ins><span class="cx"> // DatabaseManagerClient
</span><span class="cx"> virtual void dispatchDidModifyOrigin(WebCore::SecurityOrigin*);
</span><span class="cx"> virtual void dispatchDidModifyDatabase(WebCore::SecurityOrigin*, const WTF::String& databaseName);
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (202367 => 202368)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-06-23 06:10:48 UTC (rev 202367)
+++ trunk/Tools/ChangeLog 2016-06-23 06:33:07 UTC (rev 202368)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-06-22 Per Arne Vollan <pvollan@apple.com>
+
+ [Win] The test storage/indexeddb/modern/handle-user-delete.html is timing out.
+ https://bugs.webkit.org/show_bug.cgi?id=158934
+
+ Reviewed by Brent Fulgham.
+
+ DumpRenderTree should also delete indexed databases when clearAllDatabases() is called.
+
+ * DumpRenderTree/win/TestRunnerWin.cpp:
+ (TestRunner::clearAllDatabases):
+
</ins><span class="cx"> 2016-06-22 Saam Barati <sbarati@apple.com>
</span><span class="cx">
</span><span class="cx"> run-javascriptcore-tests should have some environment variables for commonly used settings
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreewinTestRunnerWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/win/TestRunnerWin.cpp (202367 => 202368)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/win/TestRunnerWin.cpp 2016-06-23 06:10:48 UTC (rev 202367)
+++ trunk/Tools/DumpRenderTree/win/TestRunnerWin.cpp 2016-06-23 06:33:07 UTC (rev 202368)
</span><span class="lines">@@ -159,6 +159,12 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> databaseManager->deleteAllDatabases();
</span><ins>+
+ COMPtr<IWebDatabaseManager2> databaseManager2;
+ if (FAILED(databaseManager->QueryInterface(&databaseManager2)))
+ return;
+
+ databaseManager2->deleteAllIndexedDatabases();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TestRunner::setStorageDatabaseIdleInterval(double)
</span></span></pre>
</div>
</div>
</body>
</html>