Changeset 202368 in webkit


Ignore:
Timestamp:
Jun 22, 2016 11:33:07 PM (8 years ago)
Author:
pvollan@apple.com
Message:

[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):

Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebKit/win/ChangeLog

    r202163 r202368  
     12016-06-22  Per Arne Vollan  <pvollan@apple.com>
     2
     3        [Win] The test storage/indexeddb/modern/handle-user-delete.html is timing out.
     4        https://bugs.webkit.org/show_bug.cgi?id=158934
     5
     6        Reviewed by Brent Fulgham.
     7
     8        Add a method to delete all indexed databases.
     9
     10        * Interfaces/IWebDatabaseManager.idl:
     11        * WebDatabaseManager.cpp:
     12        (WebDatabaseManager::QueryInterface):
     13        (WebDatabaseManager::deleteAllIndexedDatabases):
     14        * WebDatabaseManager.h:
     15
    1162016-06-17  Per Arne Vollan  <pvollan@apple.com>
    217
  • trunk/Source/WebKit/win/Interfaces/IWebDatabaseManager.idl

    r165676 r202368  
    6363    HRESULT setQuota([in] BSTR originName, [in] unsigned long long quota);
    6464}
     65
     66[
     67    uuid(759C2356-181C-4CCF-9E11-6F6242FB8C78)
     68]
     69interface IWebDatabaseManager2 : IWebDatabaseManager
     70{
     71    HRESULT deleteAllIndexedDatabases();
     72}
  • trunk/Source/WebKit/win/WebDatabaseManager.cpp

    r199309 r202368  
    4343#include <wtf/MainThread.h>
    4444
     45#if ENABLE(INDEXED_DATABASE)
     46#include "WebDatabaseProvider.h"
     47#endif
     48
    4549using namespace WebCore;
    4650
     
    175179    else if (IsEqualGUID(riid, IID_IWebDatabaseManager))
    176180        *ppvObject = static_cast<WebDatabaseManager*>(this);
     181    else if (IsEqualGUID(riid, IID_IWebDatabaseManager2))
     182        *ppvObject = static_cast<WebDatabaseManager*>(this);
    177183    else
    178184        return E_NOINTERFACE;
     
    325331    DatabaseManager::singleton().deleteDatabase(webSecurityOrigin->securityOrigin(), String(databaseName, SysStringLen(databaseName)));
    326332
     333    return S_OK;
     334}
     335
     336HRESULT WebDatabaseManager::deleteAllIndexedDatabases()
     337{
     338#if ENABLE(INDEXED_DATABASE)
     339    WebDatabaseProvider::singleton().deleteAllDatabases();
     340#endif
    327341    return S_OK;
    328342}
  • trunk/Source/WebKit/win/WebDatabaseManager.h

    r188662 r202368  
    3333#include <WebCore/DatabaseManagerClient.h>
    3434
    35 class WebDatabaseManager : public IWebDatabaseManager, private WebCore::DatabaseManagerClient {
     35class WebDatabaseManager : public IWebDatabaseManager2, private WebCore::DatabaseManagerClient {
    3636public:
    3737    static WebDatabaseManager* createInstance();
     
    5252    virtual HRESULT STDMETHODCALLTYPE setQuota(_In_ BSTR origin, unsigned long long quota);
    5353
     54    // IWebDatabaseManager2
     55    virtual HRESULT STDMETHODCALLTYPE deleteAllIndexedDatabases();
     56
    5457    // DatabaseManagerClient
    5558    virtual void dispatchDidModifyOrigin(WebCore::SecurityOrigin*);
  • trunk/Tools/ChangeLog

    r202366 r202368  
     12016-06-22  Per Arne Vollan  <pvollan@apple.com>
     2
     3        [Win] The test storage/indexeddb/modern/handle-user-delete.html is timing out.
     4        https://bugs.webkit.org/show_bug.cgi?id=158934
     5
     6        Reviewed by Brent Fulgham.
     7
     8        DumpRenderTree should also delete indexed databases when clearAllDatabases() is called.
     9
     10        * DumpRenderTree/win/TestRunnerWin.cpp:
     11        (TestRunner::clearAllDatabases):
     12
    1132016-06-22  Saam Barati  <sbarati@apple.com>
    214
  • trunk/Tools/DumpRenderTree/win/TestRunnerWin.cpp

    r200945 r202368  
    160160
    161161    databaseManager->deleteAllDatabases();
     162
     163    COMPtr<IWebDatabaseManager2> databaseManager2;
     164    if (FAILED(databaseManager->QueryInterface(&databaseManager2)))
     165        return;
     166
     167    databaseManager2->deleteAllIndexedDatabases();
    162168}
    163169
Note: See TracChangeset for help on using the changeset viewer.