Changeset 154987 in webkit


Ignore:
Timestamp:
Sep 3, 2013 9:51:03 AM (11 years ago)
Author:
commit-queue@webkit.org
Message:

[GTK] [WK2] TestContextMenu default-menu fails
​https://bugs.webkit.org/show_bug.cgi?id=120459

Patch by Brian Holt <​brian.holt@samsung.com> on 2013-09-03
Reviewed by Gustavo Noronha Silva.

Add context menu items for downloading media elements.

  • UIProcess/API/gtk/WebKitContextMenuActions.cpp:

(webkitContextMenuActionGetActionTag):
(webkitContextMenuActionGetForContextMenuItem):
(webkitContextMenuActionGetLabel):

  • UIProcess/API/gtk/WebKitContextMenuActions.h:
  • UIProcess/API/gtk/tests/TestContextMenu.cpp:
Location:
trunk/Source/WebKit2
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit2/ChangeLog

    r154967 r154987  
     12013-09-03  Brian Holt  <brian.holt@samsung.com>
     2
     3        [GTK] [WK2] TestContextMenu default-menu fails
     4        https://bugs.webkit.org/show_bug.cgi?id=120459
     5
     6        Reviewed by Gustavo Noronha Silva.
     7
     8        Add context menu items for downloading media elements.
     9
     10        * UIProcess/API/gtk/WebKitContextMenuActions.cpp:
     11        (webkitContextMenuActionGetActionTag):
     12        (webkitContextMenuActionGetForContextMenuItem):
     13        (webkitContextMenuActionGetLabel):
     14        * UIProcess/API/gtk/WebKitContextMenuActions.h:
     15        * UIProcess/API/gtk/tests/TestContextMenu.cpp:
     16
    1172013-09-02  Darin Adler  <darin@apple.com>
    218

  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitContextMenuActions.cpp

    r151638 r154987  
    124124    case WEBKIT_CONTEXT_MENU_ACTION_MEDIA_MUTE:
    125125        return ContextMenuItemTagMediaMute;
     126    case WEBKIT_CONTEXT_MENU_ACTION_DOWNLOAD_VIDEO_TO_DISK:
     127    case WEBKIT_CONTEXT_MENU_ACTION_DOWNLOAD_AUDIO_TO_DISK:
     128        return ContextMenuItemTagDownloadMediaToDisk;
    126129    case WEBKIT_CONTEXT_MENU_ACTION_CUSTOM:
    127130        return ContextMenuItemBaseApplicationTag;
    … …  
    215218    case ContextMenuItemTagMediaMute:
    216219        return WEBKIT_CONTEXT_MENU_ACTION_MEDIA_MUTE;
     220    case ContextMenuItemTagDownloadMediaToDisk:
     221        return menuItem->title() == contextMenuItemTagDownloadVideoToDisk() ?
     222            WEBKIT_CONTEXT_MENU_ACTION_DOWNLOAD_VIDEO_TO_DISK : WEBKIT_CONTEXT_MENU_ACTION_DOWNLOAD_AUDIO_TO_DISK;
    217223    case ContextMenuItemBaseApplicationTag:
    218224        return WEBKIT_CONTEXT_MENU_ACTION_CUSTOM;
    … …  
    307313    case WEBKIT_CONTEXT_MENU_ACTION_MEDIA_MUTE:
    308314        return contextMenuItemTagMediaMute();
     315    case WEBKIT_CONTEXT_MENU_ACTION_DOWNLOAD_VIDEO_TO_DISK:
     316        return contextMenuItemTagDownloadVideoToDisk();
     317    case WEBKIT_CONTEXT_MENU_ACTION_DOWNLOAD_AUDIO_TO_DISK:
     318        return contextMenuItemTagDownloadAudioToDisk();
    309319    case WEBKIT_CONTEXT_MENU_ACTION_NO_ACTION:
    310320    case WEBKIT_CONTEXT_MENU_ACTION_CUSTOM:

  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitContextMenuActions.h

    r121093 r154987  
    7373 * @WEBKIT_CONTEXT_MENU_ACTION_MEDIA_PAUSE: Pause current media element.
    7474 * @WEBKIT_CONTEXT_MENU_ACTION_MEDIA_MUTE: Mute current media element.
     75 * @WEBKIT_CONTEXT_MENU_ACTION_DOWNLOAD_VIDEO_TO_DISK: Download video to disk.
     76 * @WEBKIT_CONTEXT_MENU_ACTION_DOWNLOAD_AUDIO_TO_DISK: Download audio to disk.
    7577 * @WEBKIT_CONTEXT_MENU_ACTION_CUSTOM: Custom action defined by applications.
    7678 *
    … …  
    122124    WEBKIT_CONTEXT_MENU_ACTION_MEDIA_PAUSE,
    123125    WEBKIT_CONTEXT_MENU_ACTION_MEDIA_MUTE,
     126    WEBKIT_CONTEXT_MENU_ACTION_DOWNLOAD_VIDEO_TO_DISK,
     127    WEBKIT_CONTEXT_MENU_ACTION_DOWNLOAD_AUDIO_TO_DISK,
    124128
    125129    WEBKIT_CONTEXT_MENU_ACTION_CUSTOM = 10000

  • trunk/Source/WebKit2/UIProcess/API/gtk/tests/TestContextMenu.cpp

    r151833 r154987  
    310310            iter = checkCurrentItemIsStockActionAndGetNext(iter, WEBKIT_CONTEXT_MENU_ACTION_COPY_VIDEO_LINK_TO_CLIPBOARD, Visible | Enabled);
    311311            iter = checkCurrentItemIsStockActionAndGetNext(iter, WEBKIT_CONTEXT_MENU_ACTION_OPEN_VIDEO_IN_NEW_WINDOW, Visible | Enabled);
     312            iter = checkCurrentItemIsStockActionAndGetNext(iter, WEBKIT_CONTEXT_MENU_ACTION_DOWNLOAD_VIDEO_TO_DISK, Visible | Enabled);
    312313            break;
    313314        case Editable:
Note: See TracChangeset for help on using the changeset viewer.