Changeset 139776 in webkit


Ignore:
Timestamp:
Jan 15, 2013 12:49:36 PM (11 years ago)
Author:
jochen@chromium.org
Message:

[chromium] move WebDatabase related methods to TestRunner library
​https://bugs.webkit.org/show_bug.cgi?id=106905

Reviewed by Adam Barth.

  • DumpRenderTree/chromium/DRTTestRunner.cpp:

(DRTTestRunner::DRTTestRunner):
(DRTTestRunner::reset):

  • DumpRenderTree/chromium/DRTTestRunner.h:

(DRTTestRunner):

  • DumpRenderTree/chromium/TestRunner/public/WebTestDelegate.h:

(WebTestRunner::WebTestDelegate::clearAllDatabases):
(WebTestRunner::WebTestDelegate::setDatabaseQuota):

  • DumpRenderTree/chromium/TestRunner/src/TestRunner.cpp:

(WebTestRunner::TestRunner::TestRunner):
(WebTestRunner::TestRunner::reset):
(WebTestRunner::TestRunner::clearAllDatabases):
(WebTestRunner):
(WebTestRunner::TestRunner::setDatabaseQuota):

  • DumpRenderTree/chromium/TestRunner/src/TestRunner.h:

(TestRunner):

  • DumpRenderTree/chromium/WebViewHost.cpp:

(WebViewHost::clearAllDatabases):
(WebViewHost::setDatabaseQuota):

  • DumpRenderTree/chromium/WebViewHost.h:

(WebViewHost):

Location:
trunk/Tools
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/Tools/ChangeLog

    r139771 r139776  
     12013-01-15  Jochen Eisinger  <jochen@chromium.org>
     2
     3        [chromium] move WebDatabase related methods to TestRunner library
     4        https://bugs.webkit.org/show_bug.cgi?id=106905
     5
     6        Reviewed by Adam Barth.
     7
     8        * DumpRenderTree/chromium/DRTTestRunner.cpp:
     9        (DRTTestRunner::DRTTestRunner):
     10        (DRTTestRunner::reset):
     11        * DumpRenderTree/chromium/DRTTestRunner.h:
     12        (DRTTestRunner):
     13        * DumpRenderTree/chromium/TestRunner/public/WebTestDelegate.h:
     14        (WebTestRunner::WebTestDelegate::clearAllDatabases):
     15        (WebTestRunner::WebTestDelegate::setDatabaseQuota):
     16        * DumpRenderTree/chromium/TestRunner/src/TestRunner.cpp:
     17        (WebTestRunner::TestRunner::TestRunner):
     18        (WebTestRunner::TestRunner::reset):
     19        (WebTestRunner::TestRunner::clearAllDatabases):
     20        (WebTestRunner):
     21        (WebTestRunner::TestRunner::setDatabaseQuota):
     22        * DumpRenderTree/chromium/TestRunner/src/TestRunner.h:
     23        (TestRunner):
     24        * DumpRenderTree/chromium/WebViewHost.cpp:
     25        (WebViewHost::clearAllDatabases):
     26        (WebViewHost::setDatabaseQuota):
     27        * DumpRenderTree/chromium/WebViewHost.h:
     28        (WebViewHost):
     29
    1302013-01-15  Tim 'mithro' Ansell  <mithro@mithis.com>
    231

  • trunk/Tools/DumpRenderTree/chromium/DRTTestRunner.cpp

    r139722 r139776  
    105105    bindMethod("wasMockSpeechRecognitionAborted", &DRTTestRunner::wasMockSpeechRecognitionAborted);
    106106#endif
    107     bindMethod("clearAllDatabases", &DRTTestRunner::clearAllDatabases);
    108107#if ENABLE(POINTER_LOCK)
    109108    bindMethod("didAcquirePointerLock", &DRTTestRunner::didAcquirePointerLock);
    … …  
    129128    bindMethod("setCloseRemainingWindowsWhenComplete", &DRTTestRunner::setCloseRemainingWindowsWhenComplete);
    130129    bindMethod("setCustomPolicyDelegate", &DRTTestRunner::setCustomPolicyDelegate);
    131     bindMethod("setDatabaseQuota", &DRTTestRunner::setDatabaseQuota);
    132130    bindMethod("setGeolocationPermission", &DRTTestRunner::setGeolocationPermission);
    133131    bindMethod("setMockDeviceOrientation", &DRTTestRunner::setMockDeviceOrientation);
    … …  
    401399
    402400    webkit_support::SetAcceptAllCookies(false);
    403 
    404     // Reset the default quota for each origin to 5MB
    405     webkit_support::SetDatabaseQuota(5 * 1024 * 1024);
    406401
    407402    setlocale(LC_ALL, "");
    … …  
    588583}
    589584
    590 void DRTTestRunner::clearAllDatabases(const CppArgumentList& arguments, CppVariant* result)
    591 {
    592     result->setNull();
    593     webkit_support::ClearAllDatabases();
    594 }
    595 
    596 void DRTTestRunner::setDatabaseQuota(const CppArgumentList& arguments, CppVariant* result)
    597 {
    598     result->setNull();
    599     if ((arguments.size() >= 1) && arguments[0].isNumber())
    600         webkit_support::SetDatabaseQuota(arguments[0].toInt32());
    601 }
    602 
    603585void DRTTestRunner::setPOSIXLocale(const CppArgumentList& arguments, CppVariant* result)
    604586{

  • trunk/Tools/DumpRenderTree/chromium/DRTTestRunner.h

    r139722 r139776  
    132132    void displayInvalidatedRegion(const CppArgumentList&, CppVariant*);
    133133
    134     // Clears all databases.
    135     void clearAllDatabases(const CppArgumentList&, CppVariant*);
    136     // Sets the default quota for all origins
    137     void setDatabaseQuota(const CppArgumentList&, CppVariant*);
    138 
    139134    // Calls setlocale(LC_ALL, ...) for a specified locale.
    140135    // Resets between tests.

  • trunk/Tools/DumpRenderTree/chromium/TestRunner/public/WebTestDelegate.h

    r139549 r139776  
    8686    virtual void closeDevTools() { }
    8787    virtual void evaluateInWebInspector(long, const std::string&) { }
     88    virtual void clearAllDatabases() { }
     89    virtual void setDatabaseQuota(int) { }
    8890};
    8991

  • trunk/Tools/DumpRenderTree/chromium/TestRunner/src/TestRunner.cpp

    r139722 r139776  
    179179    bindMethod("closeWebInspector", &TestRunner::closeWebInspector);
    180180    bindMethod("evaluateInWebInspector", &TestRunner::evaluateInWebInspector);
     181    bindMethod("clearAllDatabases", &TestRunner::clearAllDatabases);
     182    bindMethod("setDatabaseQuota", &TestRunner::setDatabaseQuota);
    181183
    182184    // Properties.
    … …  
    244246    WebFontRendering::setSubpixelPositioning(false);
    245247#endif
     248
     249    // Reset the default quota for each origin to 5MB
     250    m_delegate->setDatabaseQuota(5 * 1024 * 1024);
    246251
    247252    m_dumpEditingCallbacks = false;
    … …  
    12961301}
    12971302
     1303void TestRunner::clearAllDatabases(const CppArgumentList& arguments, CppVariant* result)
     1304{
     1305    result->setNull();
     1306    m_delegate->clearAllDatabases();
     1307}
     1308
     1309void TestRunner::setDatabaseQuota(const CppArgumentList& arguments, CppVariant* result)
     1310{
     1311    result->setNull();
     1312    if ((arguments.size() >= 1) && arguments[0].isNumber())
     1313        m_delegate->setDatabaseQuota(arguments[0].toInt32());
     1314}
     1315
    12981316void TestRunner::dumpEditingCallbacks(const CppArgumentList&, CppVariant* result)
    12991317{

  • trunk/Tools/DumpRenderTree/chromium/TestRunner/src/TestRunner.h

    r139722 r139776  
    332332    void evaluateInWebInspector(const CppArgumentList&, CppVariant*);
    333333
     334    // Clears all databases.
     335    void clearAllDatabases(const CppArgumentList&, CppVariant*);
     336    // Sets the default quota for all origins
     337    void setDatabaseQuota(const CppArgumentList&, CppVariant*);
     338
    334339    ///////////////////////////////////////////////////////////////////////////
    335340    // Properties

  • trunk/Tools/DumpRenderTree/chromium/WebViewHost.cpp

    r139627 r139776  
    10701070}
    10711071
     1072void WebViewHost::clearAllDatabases()
     1073{
     1074    webkit_support::ClearAllDatabases();
     1075}
     1076
     1077void WebViewHost::setDatabaseQuota(int quota)
     1078{
     1079    webkit_support::SetDatabaseQuota(quota);
     1080}
     1081
    10721082// Public functions -----------------------------------------------------------
    10731083

  • trunk/Tools/DumpRenderTree/chromium/WebViewHost.h

    r139627 r139776  
    155155    virtual void closeDevTools() OVERRIDE;
    156156    virtual void evaluateInWebInspector(long, const std::string&) OVERRIDE;
     157    virtual void clearAllDatabases() OVERRIDE;
     158    virtual void setDatabaseQuota(int) OVERRIDE;
    157159
    158160    // NavigationHost
Note: See TracChangeset for help on using the changeset viewer.