Changeset 101953 in webkit


Ignore:
Timestamp:
Dec 4, 2011 3:56:22 AM (12 years ago)
Author:
commit-queue@webkit.org
Message:

Add missing methods used by fast/notifications tests to LayoutTestController
https://bugs.webkit.org/show_bug.cgi?id=63616

Patch by Alexandre Mazari <scaroo@gmail.com> on 2011-12-04
Reviewed by Martin Robinson.

Add missing simulateDesktopNotificationClick method used by
fast/notifications. Provide a default implementation for
areDesktopNotificationPermissionRequestsIgnored and
ignoreDesktopNotificationPermissionRequests.

  • DumpRenderTree/LayoutTestController.cpp:

(LayoutTestController::LayoutTestController): call into the port implementation.
(simulateDesktopNotificationClickCallback): ditto.
(ignoreDesktopNotificationPermissionRequestsCallback): default implementation.
(LayoutTestController::staticFunctions): declare new methods.
(LayoutTestController::ignoreDesktopNotificationPermissionRequests): default implementation.

  • DumpRenderTree/LayoutTestController.h:

(LayoutTestController::areDesktopNotificationPermissionRequestsIgnored):

  • DumpRenderTree/efl/LayoutTestControllerEfl.cpp:

(LayoutTestController::simulateDesktopNotificationClick): dummy implementation.

  • DumpRenderTree/gtk/LayoutTestControllerGtk.cpp:

(LayoutTestController::simulateDesktopNotificationClick): ditto.

  • DumpRenderTree/mac/LayoutTestControllerMac.mm:

(LayoutTestController::simulateDesktopNotificationClick): ditto.

  • DumpRenderTree/win/LayoutTestControllerWin.cpp:

(LayoutTestController::simulateDesktopNotificationClick): ditto.

  • DumpRenderTree/wx/LayoutTestControllerWx.cpp:

(LayoutTestController::simulateDesktopNotificationClick): ditto.

Location:
trunk/Tools
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • trunk/Tools/ChangeLog

    r101951 r101953  
     12011-12-04  Alexandre Mazari  <scaroo@gmail.com>
     2
     3        Add missing methods used by fast/notifications tests to LayoutTestController
     4        https://bugs.webkit.org/show_bug.cgi?id=63616
     5
     6        Reviewed by Martin Robinson.
     7
     8        Add missing simulateDesktopNotificationClick method used by
     9        fast/notifications. Provide a default implementation for
     10        areDesktopNotificationPermissionRequestsIgnored and
     11        ignoreDesktopNotificationPermissionRequests.
     12
     13        * DumpRenderTree/LayoutTestController.cpp:
     14        (LayoutTestController::LayoutTestController): call into the port implementation.
     15        (simulateDesktopNotificationClickCallback): ditto.
     16        (ignoreDesktopNotificationPermissionRequestsCallback): default implementation.
     17        (LayoutTestController::staticFunctions): declare new methods.
     18        (LayoutTestController::ignoreDesktopNotificationPermissionRequests): default implementation.
     19        * DumpRenderTree/LayoutTestController.h:
     20        (LayoutTestController::areDesktopNotificationPermissionRequestsIgnored):
     21        * DumpRenderTree/efl/LayoutTestControllerEfl.cpp:
     22        (LayoutTestController::simulateDesktopNotificationClick): dummy implementation.
     23        * DumpRenderTree/gtk/LayoutTestControllerGtk.cpp:
     24        (LayoutTestController::simulateDesktopNotificationClick): ditto.
     25        * DumpRenderTree/mac/LayoutTestControllerMac.mm:
     26        (LayoutTestController::simulateDesktopNotificationClick): ditto.
     27        * DumpRenderTree/win/LayoutTestControllerWin.cpp:
     28        (LayoutTestController::simulateDesktopNotificationClick): ditto.
     29        * DumpRenderTree/wx/LayoutTestControllerWx.cpp:
     30        (LayoutTestController::simulateDesktopNotificationClick): ditto.
     31
    1322011-12-03  Mario Sanchez Prada  <msanchez@igalia.com>
    233
  • trunk/Tools/DumpRenderTree/LayoutTestController.cpp

    r97407 r101953  
    9393    , m_testPathOrURL(testPathOrURL)
    9494    , m_expectedPixelHash(expectedPixelHash)
     95    , m_areDesktopNotificationPermissionRequestsIgnored(false)
    9596{
    9697}
     
    22432244    controller->setGlobalFlag(JSValueToBoolean(context, value));
    22442245    return true;
     2246}
     2247
     2248static JSValueRef ignoreDesktopNotificationPermissionRequestsCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
     2249{
     2250    LayoutTestController* controller = static_cast<LayoutTestController*>(JSObjectGetPrivate(thisObject));
     2251    controller->ignoreDesktopNotificationPermissionRequests();
     2252    return JSValueMakeUndefined(context);
     2253}
     2254
     2255static JSValueRef simulateDesktopNotificationClickCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
     2256{
     2257    LayoutTestController* controller = static_cast<LayoutTestController*>(JSObjectGetPrivate(thisObject));
     2258    JSRetainPtr<JSStringRef> title(Adopt, JSValueToStringCopy(context, arguments[0], exception));
     2259    controller->simulateDesktopNotificationClick(title.get());
     2260    return JSValueMakeUndefined(context);
    22452261}
    22462262
     
    23742390        { "hasSpellingMarker", hasSpellingMarkerCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
    23752391        { "hasGrammarMarker", hasGrammarMarkerCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
     2392        { "ignoreDesktopNotificationPermissionRequests", ignoreDesktopNotificationPermissionRequestsCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
    23762393        { "isCommandEnabled", isCommandEnabledCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
    23772394        { "isPageBoxVisible", isPageBoxVisibleCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
     
    24652482        { "setAsynchronousSpellCheckingEnabled", setAsynchronousSpellCheckingEnabledCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
    24662483        { "showWebInspector", showWebInspectorCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
     2484        { "simulateDesktopNotificationClick", simulateDesktopNotificationClickCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
    24672485        { "testOnscreen", testOnscreenCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
    24682486        { "testRepaint", testRepaintCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
     
    25452563}
    25462564
     2565void LayoutTestController::ignoreDesktopNotificationPermissionRequests()
     2566{
     2567    m_areDesktopNotificationPermissionRequestsIgnored = false;
     2568}
     2569
    25472570void LayoutTestController::waitToDumpWatchdogTimerFired()
    25482571{
  • trunk/Tools/DumpRenderTree/LayoutTestController.h

    r97407 r101953  
    142142    void grantDesktopNotificationPermission(JSStringRef origin);
    143143    bool checkDesktopNotificationPermission(JSStringRef origin);
     144    void ignoreDesktopNotificationPermissionRequests();
     145    bool areDesktopNotificationPermissionRequestsIgnored() const { return m_areDesktopNotificationPermissionRequestsIgnored; }
     146    void simulateDesktopNotificationClick(JSStringRef title);
    144147
    145148    bool elementDoesAutoCompleteForElementWithId(JSStringRef id);
     
    414417    bool m_shouldPaintBrokenImage;
    415418    bool m_shouldStayOnPageAfterHandlingBeforeUnload;
     419    bool m_areDesktopNotificationPermissionRequestsIgnored;
    416420
    417421    std::string m_authenticationUsername;
  • trunk/Tools/DumpRenderTree/efl/LayoutTestControllerEfl.cpp

    r100915 r101953  
    780780    notImplemented();
    781781}
     782
     783void LayoutTestController::simulateDesktopNotificationClick(JSStringRef title)
     784{
     785}
  • trunk/Tools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp

    r101931 r101953  
    10331033{
    10341034}
     1035
     1036void LayoutTestController::simulateDesktopNotificationClick(JSStringRef title)
     1037{
     1038}
  • trunk/Tools/DumpRenderTree/mac/LayoutTestControllerMac.mm

    r99366 r101953  
    12371237    [[mainFrame webView] _setCustomBackingScaleFactor:backingScaleFactor];
    12381238}
     1239
     1240void LayoutTestController::simulateDesktopNotificationClick(JSStringRef title)
     1241{
     1242    // FIXME: Implement.
     1243}
  • trunk/Tools/DumpRenderTree/win/LayoutTestControllerWin.cpp

    r97407 r101953  
    15571557{
    15581558}
     1559
     1560void LayoutTestController::simulateDesktopNotificationClick(JSStringRef title)
     1561{
     1562    // FIXME: Implement.
     1563}
  • trunk/Tools/DumpRenderTree/wx/LayoutTestControllerWx.cpp

    r99811 r101953  
    662662{
    663663}
     664
     665void LayoutTestController::simulateDesktopNotificationClick(JSStringRef title)
     666{
     667    // FIXME: Implement.
     668}
Note: See TracChangeset for help on using the changeset viewer.