Changeset 61909 in webkit


Ignore:
Timestamp:
Jun 25, 2010 3:34:27 PM (14 years ago)
Author:
commit-queue@webkit.org
Message:

2010-06-25 Prasad Tammana <​prasadt@chromium.org>

Reviewed by Dmitry Titov.

Add empty abortModal() method to all platforms.
​https://bugs.webkit.org/show_bug.cgi?id=40864

Add an empty abortModal() stub to LayoutTestController on all platforms to get rid of platform specific #ifs in
platform independent LayoutTestController code. Without this change, layout tests using LayoutTestController tests
that use abortModal will become mac specific which is not desirable.

  • DumpRenderTree/LayoutTestController.cpp: (abortModalCallback): (LayoutTestController::staticFunctions):
  • DumpRenderTree/LayoutTestController.h:
  • DumpRenderTree/chromium/LayoutTestController.cpp: (LayoutTestController::LayoutTestController): (LayoutTestController::abortModal):
  • DumpRenderTree/chromium/LayoutTestController.h:
  • DumpRenderTree/gtk/LayoutTestControllerGtk.cpp: (LayoutTestController::abortModal):
  • DumpRenderTree/qt/LayoutTestControllerQt.h: (LayoutTestController::abortModal):
  • DumpRenderTree/win/LayoutTestControllerWin.cpp: (LayoutTestController::abortModal):
  • DumpRenderTree/wx/LayoutTestControllerWx.cpp: (LayoutTestController::abortModal):
Location:
trunk/WebKitTools
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/WebKitTools/ChangeLog

    r61906 r61909  
     12010-06-25  Prasad Tammana  <prasadt@chromium.org>
     2
     3        Reviewed by Dmitry Titov.
     4
     5        Add empty abortModal() method to all platforms.
     6        https://bugs.webkit.org/show_bug.cgi?id=40864
     7
     8        Add an empty abortModal() stub to LayoutTestController on all platforms to get rid of platform specific #ifs in
     9        platform independent LayoutTestController code.  Without this change, layout tests using LayoutTestController tests
     10        that use abortModal will become mac specific which is not desirable.
     11
     12        * DumpRenderTree/LayoutTestController.cpp:
     13        (abortModalCallback):
     14        (LayoutTestController::staticFunctions):
     15        * DumpRenderTree/LayoutTestController.h:
     16        * DumpRenderTree/chromium/LayoutTestController.cpp:
     17        (LayoutTestController::LayoutTestController):
     18        (LayoutTestController::abortModal):
     19        * DumpRenderTree/chromium/LayoutTestController.h:
     20        * DumpRenderTree/gtk/LayoutTestControllerGtk.cpp:
     21        (LayoutTestController::abortModal):
     22        * DumpRenderTree/qt/LayoutTestControllerQt.h:
     23        (LayoutTestController::abortModal):
     24        * DumpRenderTree/win/LayoutTestControllerWin.cpp:
     25        (LayoutTestController::abortModal):
     26        * DumpRenderTree/wx/LayoutTestControllerWx.cpp:
     27        (LayoutTestController::abortModal):
     28
    1292010-06-25  Sam Weinig  <sam@webkit.org>
    230

  • trunk/WebKitTools/DumpRenderTree/LayoutTestController.cpp

    r61670 r61909  
    15141514
    15151515
    1516 #if PLATFORM(MAC)
    15171516static JSValueRef abortModalCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
    15181517{
    … …  
    15211520    return JSValueMakeUndefined(context);
    15221521}
    1523 #endif
    15241522
    15251523static JSValueRef markerTextForListItemCallback(JSContextRef context, JSObjectRef, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
    … …  
    16491647{
    16501648    static JSStaticFunction staticFunctions[] = {
    1651 #if PLATFORM(MAC)
    16521649        { "abortModal", abortModalCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
    1653 #endif
    16541650        { "addDisallowedURL", addDisallowedURLCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
    16551651        { "addUserScript", addUserScriptCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },

  • trunk/WebKitTools/DumpRenderTree/LayoutTestController.h

    r61670 r61909  
    261261    void setWebViewEditable(bool);
    262262
    263 
    264 #if PLATFORM(MAC)
    265263    void abortModal();
    266 #endif
    267264
    268265    // The following API test functions should probably be moved to platform-specific

  • trunk/WebKitTools/DumpRenderTree/chromium/LayoutTestController.cpp

    r60683 r61909  
    166166    bindMethod("setMockGeolocationPosition", &LayoutTestController::setMockGeolocationPosition);
    167167    bindMethod("setMockGeolocationError", &LayoutTestController::setMockGeolocationError);
     168    bindMethod("abortModal", &LayoutTestController::abortModal);
    168169
    169170    // The fallback method is called when an unknown method is invoked.
    … …  
    13131314    WebGeolocationServiceMock::setMockGeolocationError(arguments[0].toInt32(), cppVariantToWebString(arguments[1]));
    13141315}
     1316
     1317void LayoutTestController::abortModal(const CppArgumentList& arguments, CppVariant* result)
     1318{
     1319    result->setNull();
     1320}

  • trunk/WebKitTools/DumpRenderTree/chromium/LayoutTestController.h

    r60032 r61909  
    287287    void setMockGeolocationError(const CppArgumentList&, CppVariant*);
    288288
     289    // Empty stub method to keep parity with object model exposed by global LayoutTestController.
     290    void abortModal(const CppArgumentList&, CppVariant*);
     291
    289292public:
    290293    // The following methods are not exposed to JavaScript.

  • trunk/WebKitTools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp

    r61670 r61909  
    730730        g_object_set(G_OBJECT(settings), "editing-behavior", WEBKIT_EDITING_BEHAVIOR_MAC, NULL);
    731731}
     732
     733void LayoutTestController::abortModal()
     734{
     735}

  • trunk/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.h

    r61879 r61909  
    195195    bool geolocationPermission() const { return m_geolocationPermission; }
    196196
     197    // Empty stub method to keep parity with object model exposed by global LayoutTestController.
     198    void abortModal() {}
     199
    197200    /*
    198201        Policy values: 'on', 'auto' or 'off'.

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

    r61670 r61909  
    13091309        preferences->setEditingBehavior(WebKitEditingWinBehavior);
    13101310}
     1311
     1312void LayoutTestController::abortModal()
     1313{
     1314}

  • trunk/WebKitTools/DumpRenderTree/wx/LayoutTestControllerWx.cpp

    r61723 r61909  
    453453}
    454454
     455void LayoutTestController::abortModal()
     456{
     457}
     458
    455459JSRetainPtr<JSStringRef> LayoutTestController::pageProperty(const char* propertyName, int pageNumber) const
    456460{
Note: See TracChangeset for help on using the changeset viewer.