Changeset 139792 in webkit


Ignore:
Timestamp:
Jan 15, 2013 2:21:43 PM (11 years ago)
Author:
jochen@chromium.org
Message:

[chromium] route more webkit_support and webviewhost callbacks through WebTestDelegate
https://bugs.webkit.org/show_bug.cgi?id=106904

Reviewed by Adam Barth.

  • DumpRenderTree/chromium/DRTTestRunner.cpp:

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

  • DumpRenderTree/chromium/DRTTestRunner.h:

(DRTTestRunner):

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

(WebTestRunner::WebTestDelegate::setDeviceScaleFactor):
(WebTestRunner::WebTestDelegate::setFocus):
(WebTestRunner::WebTestDelegate::setAcceptAllCookies):
(WebTestRunner::WebTestDelegate::pathToLocalResource):
(WebTestRunner::WebTestDelegate::setLocale):

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

(WebTestRunner::TestRunner::TestRunner):
(WebTestRunner::TestRunner::reset):
(WebTestRunner::TestRunner::setAlwaysAcceptCookies):
(WebTestRunner):
(WebTestRunner::TestRunner::setWindowIsKey):
(WebTestRunner::TestRunner::pathToLocalResource):
(WebTestRunner::TestRunner::setBackingScaleFactor):
(WebTestRunner::TestRunner::setPOSIXLocale):

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

(WebTestRunner::TestRunner::taskList):
(TestRunner):

  • DumpRenderTree/chromium/WebViewHost.cpp:

(WebViewHost::setDeviceScaleFactor):
(WebViewHost::setFocus):
(WebViewHost::setAcceptAllCookies):
(WebViewHost::pathToLocalResource):
(WebViewHost::setLocale):

  • DumpRenderTree/chromium/WebViewHost.h:

(WebViewHost):

Location:
trunk/Tools
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • trunk/Tools/ChangeLog

    r139786 r139792  
     12013-01-15  Jochen Eisinger  <jochen@chromium.org>
     2
     3        [chromium] route more webkit_support and webviewhost callbacks through WebTestDelegate
     4        https://bugs.webkit.org/show_bug.cgi?id=106904
     5
     6        Reviewed by Adam Barth.
     7
     8        * DumpRenderTree/chromium/DRTTestRunner.cpp:
     9        (DRTTestRunner::DRTTestRunner):
     10        (DRTTestRunner::notifyDone):
     11        (DRTTestRunner::reset):
     12        * DumpRenderTree/chromium/DRTTestRunner.h:
     13        (DRTTestRunner):
     14        * DumpRenderTree/chromium/TestRunner/public/WebTestDelegate.h:
     15        (WebTestRunner::WebTestDelegate::setDeviceScaleFactor):
     16        (WebTestRunner::WebTestDelegate::setFocus):
     17        (WebTestRunner::WebTestDelegate::setAcceptAllCookies):
     18        (WebTestRunner::WebTestDelegate::pathToLocalResource):
     19        (WebTestRunner::WebTestDelegate::setLocale):
     20        * DumpRenderTree/chromium/TestRunner/src/TestRunner.cpp:
     21        (WebTestRunner::TestRunner::TestRunner):
     22        (WebTestRunner::TestRunner::reset):
     23        (WebTestRunner::TestRunner::setAlwaysAcceptCookies):
     24        (WebTestRunner):
     25        (WebTestRunner::TestRunner::setWindowIsKey):
     26        (WebTestRunner::TestRunner::pathToLocalResource):
     27        (WebTestRunner::TestRunner::setBackingScaleFactor):
     28        (WebTestRunner::TestRunner::setPOSIXLocale):
     29        * DumpRenderTree/chromium/TestRunner/src/TestRunner.h:
     30        (WebTestRunner::TestRunner::taskList):
     31        (TestRunner):
     32        * DumpRenderTree/chromium/WebViewHost.cpp:
     33        (WebViewHost::setDeviceScaleFactor):
     34        (WebViewHost::setFocus):
     35        (WebViewHost::setAcceptAllCookies):
     36        (WebViewHost::pathToLocalResource):
     37        (WebViewHost::setLocale):
     38        * DumpRenderTree/chromium/WebViewHost.h:
     39        (WebViewHost):
     40
    1412013-01-15  Zan Dobersek  <zdobersek@igalia.com>
    242
  • trunk/Tools/DumpRenderTree/chromium/DRTTestRunner.cpp

    r139779 r139792  
    6969#include <algorithm>
    7070#include <cctype>
    71 #include <clocale>
    7271#include <cstdlib>
    7372#include <limits>
     
    117116    bindMethod("notifyDone", &DRTTestRunner::notifyDone);
    118117    bindMethod("numberOfPendingGeolocationPermissionRequests", &DRTTestRunner:: numberOfPendingGeolocationPermissionRequests);
    119     bindMethod("pathToLocalResource", &DRTTestRunner::pathToLocalResource);
    120118    bindMethod("queueBackNavigation", &DRTTestRunner::queueBackNavigation);
    121119    bindMethod("queueForwardNavigation", &DRTTestRunner::queueForwardNavigation);
     
    125123    bindMethod("queueNonLoadingScript", &DRTTestRunner::queueNonLoadingScript);
    126124    bindMethod("queueReload", &DRTTestRunner::queueReload);
    127     bindMethod("setAlwaysAcceptCookies", &DRTTestRunner::setAlwaysAcceptCookies);
    128125    bindMethod("setCloseRemainingWindowsWhenComplete", &DRTTestRunner::setCloseRemainingWindowsWhenComplete);
    129126    bindMethod("setCustomPolicyDelegate", &DRTTestRunner::setCustomPolicyDelegate);
     
    136133    bindMethod("setPointerLockWillFailSynchronously", &DRTTestRunner::setPointerLockWillFailSynchronously);
    137134#endif
    138     bindMethod("setPOSIXLocale", &DRTTestRunner::setPOSIXLocale);
    139     bindMethod("setBackingScaleFactor", &DRTTestRunner::setBackingScaleFactor);
    140135    bindMethod("setWillSendRequestClearHeader", &DRTTestRunner::setWillSendRequestClearHeader);
    141136    bindMethod("setWillSendRequestReturnsNull", &DRTTestRunner::setWillSendRequestReturnsNull);
    142137    bindMethod("setWillSendRequestReturnsNullOnRedirect", &DRTTestRunner::setWillSendRequestReturnsNullOnRedirect);
    143     bindMethod("setWindowIsKey", &DRTTestRunner::setWindowIsKey);
    144138#if ENABLE(NOTIFICATIONS)
    145139    bindMethod("simulateLegacyWebNotificationClick", &DRTTestRunner::simulateLegacyWebNotificationClick);
     
    219213{
    220214    // Test didn't timeout. Kill the timeout timer.
    221     m_taskList.revokeAll();
     215    taskList()->revokeAll();
    222216
    223217    completeNotifyDone(false);
     
    390384{
    391385    TestRunner::reset();
    392     if (m_shell)
    393         m_shell->webViewHost()->setDeviceScaleFactor(1);
    394386    m_waitUntilDone = false;
    395387    m_webHistoryItemCount.set(0);
    396388    m_interceptPostMessage.set(false);
    397 
    398     webkit_support::SetAcceptAllCookies(false);
    399 
    400     setlocale(LC_ALL, "");
    401389
    402390    if (m_closeRemainingWindows)
     
    405393        m_closeRemainingWindows = true;
    406394    m_workQueue.reset();
    407     m_taskList.revokeAll();
    408395}
    409396
     
    435422    if (arguments.size() > 0 && arguments[0].isBool())
    436423        m_closeRemainingWindows = arguments[0].value.boolValue;
    437     result->setNull();
    438 }
    439 
    440 void DRTTestRunner::setAlwaysAcceptCookies(const CppArgumentList& arguments, CppVariant* result)
    441 {
    442     if (arguments.size() > 0)
    443         webkit_support::SetAcceptAllCookies(cppVariantToBool(arguments[0]));
    444     result->setNull();
    445 }
    446 
    447 void DRTTestRunner::setWindowIsKey(const CppArgumentList& arguments, CppVariant* result)
    448 {
    449     if (arguments.size() > 0 && arguments[0].isBool())
    450         m_shell->setFocus(m_shell->webView(), arguments[0].value.boolValue);
    451424    result->setNull();
    452425}
     
    495468}
    496469
    497 void DRTTestRunner::pathToLocalResource(const CppArgumentList& arguments, CppVariant* result)
    498 {
    499     result->setNull();
    500     if (arguments.size() <= 0 || !arguments[0].isString())
    501         return;
    502 
    503     string url = arguments[0].toString();
    504 #if OS(WINDOWS)
    505     if (!url.find("/tmp/")) {
    506         // We want a temp file.
    507         const unsigned tempPrefixLength = 5;
    508         size_t bufferSize = MAX_PATH;
    509         OwnArrayPtr<WCHAR> tempPath = adoptArrayPtr(new WCHAR[bufferSize]);
    510         DWORD tempLength = ::GetTempPathW(bufferSize, tempPath.get());
    511         if (tempLength + url.length() - tempPrefixLength + 1 > bufferSize) {
    512             bufferSize = tempLength + url.length() - tempPrefixLength + 1;
    513             tempPath = adoptArrayPtr(new WCHAR[bufferSize]);
    514             tempLength = GetTempPathW(bufferSize, tempPath.get());
    515             ASSERT(tempLength < bufferSize);
    516         }
    517         string resultPath(WebString(tempPath.get(), tempLength).utf8());
    518         resultPath.append(url.substr(tempPrefixLength));
    519         result->set(resultPath);
    520         return;
    521     }
    522 #endif
    523 
    524     // Some layout tests use file://// which we resolve as a UNC path. Normalize
    525     // them to just file:///.
    526     string lowerUrl = url;
    527     transform(lowerUrl.begin(), lowerUrl.end(), lowerUrl.begin(), ::tolower);
    528     while (!lowerUrl.find("file:////")) {
    529         url = url.substr(0, 8) + url.substr(9);
    530         lowerUrl = lowerUrl.substr(0, 8) + lowerUrl.substr(9);
    531     }
    532     result->set(webkit_support::RewriteLayoutTestsURL(url).spec());
    533 }
    534 
    535470
    536471#if ENABLE(NOTIFICATIONS)
     
    579514    host->displayRepaintMask();
    580515    result->setNull();
    581 }
    582 
    583 void DRTTestRunner::setPOSIXLocale(const CppArgumentList& arguments, CppVariant* result)
    584 {
    585     result->setNull();
    586     if (arguments.size() == 1 && arguments[0].isString())
    587         setlocale(LC_ALL, arguments[0].toString().c_str());
    588516}
    589517
     
    703631#endif
    704632
    705 class InvokeCallbackTask : public WebMethodTask<DRTTestRunner> {
    706 public:
    707     InvokeCallbackTask(DRTTestRunner* object, PassOwnArrayPtr<CppVariant> callbackArguments, uint32_t numberOfArguments)
    708         : WebMethodTask<DRTTestRunner>(object)
    709         , m_callbackArguments(callbackArguments)
    710         , m_numberOfArguments(numberOfArguments)
    711     {
    712     }
    713 
    714     virtual void runIfValid()
    715     {
    716         CppVariant invokeResult;
    717         m_callbackArguments[0].invokeDefault(m_callbackArguments.get(), m_numberOfArguments, invokeResult);
    718     }
    719 
    720 private:
    721     OwnArrayPtr<CppVariant> m_callbackArguments;
    722     uint32_t m_numberOfArguments;
    723 };
    724 
    725 void DRTTestRunner::setBackingScaleFactor(const CppArgumentList& arguments, CppVariant* result)
    726 {
    727     if (arguments.size() < 2 || !arguments[0].isNumber() || !arguments[1].isObject())
    728         return;
    729    
    730     float value = arguments[0].value.doubleValue;
    731     m_shell->webViewHost()->setDeviceScaleFactor(value);
    732 
    733     OwnArrayPtr<CppVariant> callbackArguments = adoptArrayPtr(new CppVariant[1]);
    734     callbackArguments[0].set(arguments[1]);
    735     result->setNull();
    736     postTask(new InvokeCallbackTask(this, callbackArguments.release(), 1));
    737 }
    738 
    739633#if ENABLE(POINTER_LOCK)
    740634void DRTTestRunner::didAcquirePointerLock(const CppArgumentList&, CppVariant* result)
  • trunk/Tools/DumpRenderTree/chromium/DRTTestRunner.h

    r139779 r139792  
    9494    void queueLoadHTMLString(const CppArgumentList&, CppVariant*);
    9595
    96     // Changes the cookie policy from the default to allow all cookies.
    97     void setAlwaysAcceptCookies(const CppArgumentList&, CppVariant*);
    98 
    99     // Gives focus to the window.
    100     void setWindowIsKey(const CppArgumentList&, CppVariant*);
    101 
    10296
    10397    // Causes navigation actions just printout the intended navigation instead
     
    117111    // Causes WillSendRequest to return an empty request.
    118112    void setWillSendRequestReturnsNull(const CppArgumentList&, CppVariant*);
    119 
    120     // Converts a URL starting with file:///tmp/ to the local mapping.
    121     void pathToLocalResource(const CppArgumentList&, CppVariant*);
    122113
    123114#if ENABLE(NOTIFICATIONS)
     
    130121    void display(const CppArgumentList&, CppVariant*);
    131122    void displayInvalidatedRegion(const CppArgumentList&, CppVariant*);
    132 
    133     // Calls setlocale(LC_ALL, ...) for a specified locale.
    134     // Resets between tests.
    135     void setPOSIXLocale(const CppArgumentList&, CppVariant*);
    136123
    137124    // Gets the number of geolocation permissions requests pending.
     
    165152#endif
    166153
    167     // Used to set the device scale factor.
    168     void setBackingScaleFactor(const CppArgumentList&, CppVariant*);
    169 
    170154public:
    171155    // The following methods are not exposed to JavaScript.
     
    198182        virtual bool run(TestShell*) = 0;
    199183    };
    200 
    201     WebTaskList* taskList() { return &m_taskList; }
    202184
    203185private:
     
    242224    };
    243225
    244     // Used for test timeouts.
    245     WebTaskList m_taskList;
    246 
    247226    // Non-owning pointer. The DRTTestRunner is owned by the host.
    248227    TestShell* m_shell;
  • trunk/Tools/DumpRenderTree/chromium/TestRunner/public/WebTestDelegate.h

    r139776 r139792  
    8888    virtual void clearAllDatabases() { }
    8989    virtual void setDatabaseQuota(int) { }
     90    virtual void setDeviceScaleFactor(float) { }
     91    virtual void setFocus(bool) { }
     92    virtual void setAcceptAllCookies(bool) { }
     93    virtual std::string pathToLocalResource(const std::string& resource) { return std::string(); }
     94    virtual void setLocale(const std::string&) { }
    9095};
    9196
  • trunk/Tools/DumpRenderTree/chromium/TestRunner/src/TestRunner.cpp

    r139779 r139792  
    4848#include "WebSettings.h"
    4949#include "WebSurroundingText.h"
     50#include "WebTask.h"
    5051#include "WebTestDelegate.h"
    5152#include "WebView.h"
     
    5455#include "platform/WebSerializedScriptValue.h"
    5556#include "v8/include/v8.h"
     57#include <wtf/OwnArrayPtr.h>
    5658#include <wtf/text/WTFString.h>
    5759
     
    7577    virtual void postFailure(const WebSerializedScriptValue& data) const { }
    7678    virtual void destroy() { }
     79};
     80
     81class InvokeCallbackTask : public WebMethodTask<TestRunner> {
     82public:
     83    InvokeCallbackTask(TestRunner* object, PassOwnArrayPtr<CppVariant> callbackArguments, uint32_t numberOfArguments)
     84        : WebMethodTask<TestRunner>(object)
     85        , m_callbackArguments(callbackArguments)
     86        , m_numberOfArguments(numberOfArguments)
     87    {
     88    }
     89
     90    virtual void runIfValid()
     91    {
     92        CppVariant invokeResult;
     93        m_callbackArguments[0].invokeDefault(m_callbackArguments.get(), m_numberOfArguments, invokeResult);
     94    }
     95
     96private:
     97    OwnArrayPtr<CppVariant> m_callbackArguments;
     98    uint32_t m_numberOfArguments;
    7799};
    78100
     
    181203    bindMethod("clearAllDatabases", &TestRunner::clearAllDatabases);
    182204    bindMethod("setDatabaseQuota", &TestRunner::setDatabaseQuota);
     205    bindMethod("setAlwaysAcceptCookies", &TestRunner::setAlwaysAcceptCookies);
     206    bindMethod("setWindowIsKey", &TestRunner::setWindowIsKey);
     207    bindMethod("pathToLocalResource", &TestRunner::pathToLocalResource);
     208    bindMethod("setBackingScaleFactor", &TestRunner::setBackingScaleFactor);
     209    bindMethod("setPOSIXLocale", &TestRunner::setPOSIXLocale);
    183210
    184211    // Properties.
     
    250277    // Reset the default quota for each origin to 5MB
    251278    m_delegate->setDatabaseQuota(5 * 1024 * 1024);
     279    m_delegate->setDeviceScaleFactor(1);
     280    m_delegate->setAcceptAllCookies(false);
     281    m_delegate->setLocale("");
    252282
    253283    m_dumpEditingCallbacks = false;
     
    283313
    284314    m_webPermissions->reset();
     315
     316    m_taskList.revokeAll();
    285317}
    286318
     
    13211353}
    13221354
     1355void TestRunner::setAlwaysAcceptCookies(const CppArgumentList& arguments, CppVariant* result)
     1356{
     1357    if (arguments.size() > 0)
     1358        m_delegate->setAcceptAllCookies(cppVariantToBool(arguments[0]));
     1359    result->setNull();
     1360}
     1361
     1362void TestRunner::setWindowIsKey(const CppArgumentList& arguments, CppVariant* result)
     1363{
     1364    if (arguments.size() > 0 && arguments[0].isBool())
     1365        m_delegate->setFocus(arguments[0].value.boolValue);
     1366    result->setNull();
     1367}
     1368
     1369void TestRunner::pathToLocalResource(const CppArgumentList& arguments, CppVariant* result)
     1370{
     1371    result->setNull();
     1372    if (arguments.size() <= 0 || !arguments[0].isString())
     1373        return;
     1374
     1375    result->set(m_delegate->pathToLocalResource(arguments[0].toString()));
     1376}
     1377
     1378void TestRunner::setBackingScaleFactor(const CppArgumentList& arguments, CppVariant* result)
     1379{
     1380    if (arguments.size() < 2 || !arguments[0].isNumber() || !arguments[1].isObject())
     1381        return;
     1382
     1383    float value = arguments[0].value.doubleValue;
     1384    m_delegate->setDeviceScaleFactor(value);
     1385
     1386    OwnArrayPtr<CppVariant> callbackArguments = adoptArrayPtr(new CppVariant[1]);
     1387    callbackArguments[0].set(arguments[1]);
     1388    result->setNull();
     1389    m_delegate->postTask(new InvokeCallbackTask(this, callbackArguments.release(), 1));
     1390}
     1391
     1392void TestRunner::setPOSIXLocale(const CppArgumentList& arguments, CppVariant* result)
     1393{
     1394    result->setNull();
     1395    if (arguments.size() == 1 && arguments[0].isString())
     1396        m_delegate->setLocale(arguments[0].toString());
     1397}
     1398
    13231399void TestRunner::dumpEditingCallbacks(const CppArgumentList&, CppVariant* result)
    13241400{
  • trunk/Tools/DumpRenderTree/chromium/TestRunner/src/TestRunner.h

    r139779 r139792  
    3535#include "CppBoundClass.h"
    3636#include "WebDeliveredIntentClient.h"
     37#include "WebTask.h"
    3738#include "WebTestRunner.h"
    3839#include "platform/WebArrayBufferView.h"
     
    5960
    6061    void reset();
     62
     63    WebTaskList* taskList() { return &m_taskList; }
    6164
    6265    // WebTestRunner implementation.
     
    338341    void setDatabaseQuota(const CppArgumentList&, CppVariant*);
    339342
     343    // Changes the cookie policy from the default to allow all cookies.
     344    void setAlwaysAcceptCookies(const CppArgumentList&, CppVariant*);
     345
     346    // Gives focus to the window.
     347    void setWindowIsKey(const CppArgumentList&, CppVariant*);
     348
     349    // Converts a URL starting with file:///tmp/ to the local mapping.
     350    void pathToLocalResource(const CppArgumentList&, CppVariant*);
     351
     352    // Used to set the device scale factor.
     353    void setBackingScaleFactor(const CppArgumentList&, CppVariant*);
     354
     355    // Calls setlocale(LC_ALL, ...) for a specified locale.
     356    // Resets between tests.
     357    void setPOSIXLocale(const CppArgumentList&, CppVariant*);
     358
    340359    ///////////////////////////////////////////////////////////////////////////
    341360    // Properties
    342361    void workerThreadCount(CppVariant*);
    343362
    344     ///////////////////////////////////////////////////////////////////////////
     363    //////////////////////////////////////////////////////////////////////////
    345364    // Fallback and stub methods
    346365
     
    467486    WebKit::WebArrayBufferView m_audioData;
    468487
     488    // Used for test timeouts.
     489    WebTaskList m_taskList;
     490
    469491    WebTestDelegate* m_delegate;
    470492    WebKit::WebView* m_webView;
  • trunk/Tools/DumpRenderTree/chromium/WebViewHost.cpp

    r139779 r139792  
    7171#include "webkit/support/test_media_stream_client.h"
    7272#include "webkit/support/webkit_support.h"
     73#include <cctype>
     74#include <clocale>
    7375#include <public/WebCString.h>
    7476#include <public/WebCompositorOutputSurface.h>
     
    10771079{
    10781080    webkit_support::SetDatabaseQuota(quota);
     1081}
     1082
     1083void WebViewHost::setDeviceScaleFactor(float deviceScaleFactor)
     1084{
     1085    webView()->setDeviceScaleFactor(deviceScaleFactor);
     1086    discardBackingStore();
     1087}
     1088
     1089void WebViewHost::setFocus(bool focused)
     1090{
     1091    m_shell->setFocus(m_shell->webView(), focused);
     1092}
     1093
     1094void WebViewHost::setAcceptAllCookies(bool acceptCookies)
     1095{
     1096    webkit_support::SetAcceptAllCookies(acceptCookies);
     1097}
     1098
     1099string WebViewHost::pathToLocalResource(const string& url)
     1100{
     1101#if OS(WINDOWS)
     1102    if (!url.find("/tmp/")) {
     1103        // We want a temp file.
     1104        const unsigned tempPrefixLength = 5;
     1105        size_t bufferSize = MAX_PATH;
     1106        OwnArrayPtr<WCHAR> tempPath = adoptArrayPtr(new WCHAR[bufferSize]);
     1107        DWORD tempLength = ::GetTempPathW(bufferSize, tempPath.get());
     1108        if (tempLength + url.length() - tempPrefixLength + 1 > bufferSize) {
     1109            bufferSize = tempLength + url.length() - tempPrefixLength + 1;
     1110            tempPath = adoptArrayPtr(new WCHAR[bufferSize]);
     1111            tempLength = GetTempPathW(bufferSize, tempPath.get());
     1112            ASSERT(tempLength < bufferSize);
     1113        }
     1114        string resultPath(WebString(tempPath.get(), tempLength).utf8());
     1115        resultPath.append(url.substr(tempPrefixLength));
     1116        return resultPath;
     1117    }
     1118#endif
     1119
     1120    // Some layout tests use file://// which we resolve as a UNC path. Normalize
     1121    // them to just file:///.
     1122    string lowerUrl = url;
     1123    string result = url;
     1124    transform(lowerUrl.begin(), lowerUrl.end(), lowerUrl.begin(), ::tolower);
     1125    while (!lowerUrl.find("file:////")) {
     1126        result = result.substr(0, 8) + result.substr(9);
     1127        lowerUrl = lowerUrl.substr(0, 8) + lowerUrl.substr(9);
     1128    }
     1129    return webkit_support::RewriteLayoutTestsURL(result).spec();
     1130}
     1131
     1132void WebViewHost::setLocale(const std::string& locale)
     1133{
     1134    setlocale(LC_ALL, locale.c_str());
    10791135}
    10801136
     
    14021458}
    14031459
    1404 void WebViewHost::setDeviceScaleFactor(float deviceScaleFactor)
    1405 {
    1406     webView()->setDeviceScaleFactor(deviceScaleFactor);
    1407     discardBackingStore();
    1408 }
    1409 
    14101460void WebViewHost::setPageTitle(const WebString&)
    14111461{
  • trunk/Tools/DumpRenderTree/chromium/WebViewHost.h

    r139776 r139792  
    9797    void setRequestReturnNull(bool returnNull) { m_requestReturnNull = returnNull; }
    9898    void setPendingExtraData(PassOwnPtr<TestShellExtraData>);
    99     void setDeviceScaleFactor(float);
    10099
    101100    void paintRect(const WebKit::WebRect&);
     
    157156    virtual void clearAllDatabases() OVERRIDE;
    158157    virtual void setDatabaseQuota(int) OVERRIDE;
     158    virtual void setDeviceScaleFactor(float) OVERRIDE;
     159    virtual void setFocus(bool) OVERRIDE;
     160    virtual void setAcceptAllCookies(bool) OVERRIDE;
     161    virtual std::string pathToLocalResource(const std::string& url) OVERRIDE;
     162    virtual void setLocale(const std::string&) OVERRIDE;
    159163
    160164    // NavigationHost
Note: See TracChangeset for help on using the changeset viewer.