Changeset 47240 in webkit


Ignore:
Timestamp:
Aug 13, 2009 3:27:53 PM (15 years ago)
Author:
mrowe@apple.com
Message:

Roll out r47237 as it was mistakenly landed.

Location:
trunk
Files:
9 edited

Legend:

Unmodified
Added
Removed

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

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

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

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

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

    r47237 r47240  
    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">
    43<style>
    54.testDiv {

  • trunk/LayoutTests/platform/win/Skipped

    r47237 r47240  
    7979# Lucida Grande is not used for Hebrew text <https://bugs.webkit.org/show_bug.cgi?id=23925>
    8080editing/selection/extend-selection-bidi.html
     81fast/css/text-overflow-ellipsis.html
     82fast/css/text-overflow-ellipsis-bidi.html
     83fast/css/text-overflow-ellipsis-strict.html
    8184
    8285# <rdar://problem/5720592> Width of certain complex text is off by one
    … …  
    338341plugins/netscape-plugin-setwindow-size.html
    339342svg/custom/gradient-stop-style-change.svg
     343
     344# Missing LayoutTestController implementations and database related delegate callback
     345storage/quota-tracking.html
     346storage/success-callback.html
     347
     348# Crashes, probably needs new SQLite
     349storage/multiple-transactions.html
     350
     351# Application cache
     352http/tests/appcache
    340353
    341354# <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

    r47237 r47240  
    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);
    6462}

  • trunk/WebKit/win/WebDatabaseManager.cpp

    r47237 r47240  
    287287    return S_OK;
    288288}
    289 
    290 HRESULT 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 }
    304289   
    305290HRESULT STDMETHODCALLTYPE WebDatabaseManager::deleteOrigin(

  • trunk/WebKit/win/WebDatabaseManager.h

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

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

    r47237 r47240  
    728728void LayoutTestController::setDatabaseQuota(unsigned long long quota)
    729729{
    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);
     730    printf("ERROR: LayoutTestController::setDatabaseQuota() not implemented\n");
    739731}
    740732

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

    r47237 r47240  
    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 
    577566    static const unsigned long long defaultQuota = 5 * 1024 * 1024;
    578567    origin->setQuota(defaultQuota);
Note: See TracChangeset for help on using the changeset viewer.