Changeset 47237 in webkit


Ignore:
Timestamp:
Aug 13, 2009 3:17:14 PM (15 years ago)
Author:
bweinstein@apple.com
Message:

DRT improvements for Database stuff.

Location:
trunk
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/fast/css/text-overflow-ellipsis-bidi.html

    r43664 r47237  
    33<head>
    44<meta charset="utf-8">
     5<link href="../text/international/resources/Mac-compatible-font-fallback.css" rel="stylesheet" type="text/css">
    56<style type="text/css">
    67.testBlock {

  • trunk/LayoutTests/fast/css/text-overflow-ellipsis-strict.html

    r43664 r47237  
    22<head>
    33<meta charset="utf-8">
     4<link href="../text/international/resources/Mac-compatible-font-fallback.css" rel="stylesheet" type="text/css">
    45<style>
    56.testDiv {

  • trunk/LayoutTests/fast/css/text-overflow-ellipsis.html

    r43664 r47237  
    11<META HTTP-EQUIV="CONTENT-TYPE" CONTENT="TEXT/HTML; CHARSET=utf8">
    22<head>
     3<link href="../text/international/resources/Mac-compatible-font-fallback.css" rel="stylesheet" type="text/css">
    34<style>
    45.testDiv {

  • trunk/LayoutTests/platform/win/Skipped

    r47235 r47237  
    7979# Lucida Grande is not used for Hebrew text <https://bugs.webkit.org/show_bug.cgi?id=23925>
    8080editing/selection/extend-selection-bidi.html
    81 fast/css/text-overflow-ellipsis.html
    82 fast/css/text-overflow-ellipsis-bidi.html
    83 fast/css/text-overflow-ellipsis-strict.html
    8481
    8582# <rdar://problem/5720592> Width of certain complex text is off by one
    … …  
    341338plugins/netscape-plugin-setwindow-size.html
    342339svg/custom/gradient-stop-style-change.svg
    343 
    344 # Missing LayoutTestController implementations and database related delegate callback
    345 storage/quota-tracking.html
    346 storage/success-callback.html
    347 
    348 # Crashes, probably needs new SQLite
    349 storage/multiple-transactions.html
    350 
    351 # Application cache
    352 http/tests/appcache
    353340
    354341# <rdar://problem/5961006> LayoutTests that send an OPTIONS request don't work on Windows due to Apache 1.3

  • trunk/WebKit/win/Interfaces/IWebDatabaseManager.idl

    r30180 r47237  
    6060    HRESULT deleteOrigin([in] IWebSecurityOrigin* origin);
    6161    HRESULT deleteDatabase([in] BSTR databaseName, [in] IWebSecurityOrigin* origin);
     62
     63    HRESULT setQuota([in] BSTR origin, [in] unsigned long long quota);
    6264}

  • trunk/WebKit/win/WebDatabaseManager.cpp

    r45891 r47237  
    287287    return S_OK;
    288288}
     289
     290HRESULT STDMETHODCALLTYPE WebDatabaseManager::setQuota(
     291    /* [in] */ BSTR origin,
     292    /* [in] */ unsigned long long quota)
     293{
     294    if (!origin)
     295        return E_POINTER;
     296
     297    if (this != s_sharedWebDatabaseManager)
     298        return E_FAIL;
     299
     300    DatabaseTracker::tracker().setQuota(SecurityOrigin::createFromString(origin).get(), quota);
     301
     302    return S_OK;
     303}
    289304   
    290305HRESULT STDMETHODCALLTYPE WebDatabaseManager::deleteOrigin(

  • trunk/WebKit/win/WebDatabaseManager.h

    r43283 r47237  
    7474        /* [in] */ IWebSecurityOrigin* origin);
    7575
     76    virtual HRESULT STDMETHODCALLTYPE setQuota(
     77        /* [in] */ BSTR origin,
     78        /* [in] */ unsigned long long quota);
     79
    7680    // DatabaseTrackerClient
    7781    virtual void dispatchDidModifyOrigin(WebCore::SecurityOrigin*);

  • trunk/WebKitTools/DumpRenderTree/win/LayoutTestControllerWin.cpp

    r47213 r47237  
    728728void LayoutTestController::setDatabaseQuota(unsigned long long quota)
    729729{
    730     printf("ERROR: LayoutTestController::setDatabaseQuota() not implemented\n");
     730    COMPtr<IWebDatabaseManager> databaseManager;
     731    COMPtr<IWebDatabaseManager> tmpDatabaseManager;
     732
     733    if (FAILED(WebKitCreateInstance(CLSID_WebDatabaseManager, 0, IID_IWebDatabaseManager, (void**)&tmpDatabaseManager)))
     734        return;
     735    if (FAILED(tmpDatabaseManager->sharedWebDatabaseManager(&databaseManager)))
     736        return;
     737
     738    databaseManager->setQuota(TEXT("file:///"), quota);
    731739}
    732740

  • trunk/WebKitTools/DumpRenderTree/win/UIDelegate.cpp

    r47056 r47237  
    564564        /* [in] */ BSTR databaseIdentifier)
    565565{
     566    BSTR protocol;
     567    BSTR host;
     568    unsigned short port;
     569
     570    origin->protocol(&protocol);
     571    origin->host(&host);
     572    origin->port(&port);
     573
     574    if (!done && gLayoutTestController->dumpDatabaseCallbacks())
     575        printf("UI DELEGATE DATABASE CALLBACK: exceededDatabaseQuotaForSecurityOrigin:{%S, %S, %i} database:%S\n", protocol, host, port, databaseIdentifier);
     576
    566577    static const unsigned long long defaultQuota = 5 * 1024 * 1024;
    567578    origin->setQuota(defaultQuota);
Note: See TracChangeset for help on using the changeset viewer.