Title: [155437] releases/WebKitGTK/webkit-2.2/Source/WebKit2
- Revision
- 155437
- Author
- [email protected]
- Date
- 2013-09-10 06:39:52 -0700 (Tue, 10 Sep 2013)
Log Message
Merge r154987 - [GTK] [WK2] TestContextMenu default-menu fails
https://bugs.webkit.org/show_bug.cgi?id=120459
Patch by Brian Holt <[email protected]> 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:
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.2/Source/WebKit2/ChangeLog (155436 => 155437)
--- releases/WebKitGTK/webkit-2.2/Source/WebKit2/ChangeLog 2013-09-10 13:36:26 UTC (rev 155436)
+++ releases/WebKitGTK/webkit-2.2/Source/WebKit2/ChangeLog 2013-09-10 13:39:52 UTC (rev 155437)
@@ -1,3 +1,19 @@
+2013-09-03 Brian Holt <[email protected]>
+
+ [GTK] [WK2] TestContextMenu default-menu fails
+ https://bugs.webkit.org/show_bug.cgi?id=120459
+
+ 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:
+
2013-09-10 Carlos Garcia Campos <[email protected]>
[GTK] /webkit2/WebKitWebView/default-menu fails when GtkSettings:gtk-show-input-method-menu is disabled
Modified: releases/WebKitGTK/webkit-2.2/Source/WebKit2/UIProcess/API/gtk/WebKitContextMenuActions.cpp (155436 => 155437)
--- releases/WebKitGTK/webkit-2.2/Source/WebKit2/UIProcess/API/gtk/WebKitContextMenuActions.cpp 2013-09-10 13:36:26 UTC (rev 155436)
+++ releases/WebKitGTK/webkit-2.2/Source/WebKit2/UIProcess/API/gtk/WebKitContextMenuActions.cpp 2013-09-10 13:39:52 UTC (rev 155437)
@@ -123,6 +123,9 @@
return ContextMenuItemTagMediaPlayPause;
case WEBKIT_CONTEXT_MENU_ACTION_MEDIA_MUTE:
return ContextMenuItemTagMediaMute;
+ case WEBKIT_CONTEXT_MENU_ACTION_DOWNLOAD_VIDEO_TO_DISK:
+ case WEBKIT_CONTEXT_MENU_ACTION_DOWNLOAD_AUDIO_TO_DISK:
+ return ContextMenuItemTagDownloadMediaToDisk;
case WEBKIT_CONTEXT_MENU_ACTION_CUSTOM:
return ContextMenuItemBaseApplicationTag;
default:
@@ -214,6 +217,9 @@
WEBKIT_CONTEXT_MENU_ACTION_MEDIA_PLAY : WEBKIT_CONTEXT_MENU_ACTION_MEDIA_PAUSE;
case ContextMenuItemTagMediaMute:
return WEBKIT_CONTEXT_MENU_ACTION_MEDIA_MUTE;
+ case ContextMenuItemTagDownloadMediaToDisk:
+ return menuItem->title() == contextMenuItemTagDownloadVideoToDisk() ?
+ WEBKIT_CONTEXT_MENU_ACTION_DOWNLOAD_VIDEO_TO_DISK : WEBKIT_CONTEXT_MENU_ACTION_DOWNLOAD_AUDIO_TO_DISK;
case ContextMenuItemBaseApplicationTag:
return WEBKIT_CONTEXT_MENU_ACTION_CUSTOM;
default:
@@ -306,6 +312,10 @@
return contextMenuItemTagMediaPause();
case WEBKIT_CONTEXT_MENU_ACTION_MEDIA_MUTE:
return contextMenuItemTagMediaMute();
+ case WEBKIT_CONTEXT_MENU_ACTION_DOWNLOAD_VIDEO_TO_DISK:
+ return contextMenuItemTagDownloadVideoToDisk();
+ case WEBKIT_CONTEXT_MENU_ACTION_DOWNLOAD_AUDIO_TO_DISK:
+ return contextMenuItemTagDownloadAudioToDisk();
case WEBKIT_CONTEXT_MENU_ACTION_NO_ACTION:
case WEBKIT_CONTEXT_MENU_ACTION_CUSTOM:
case WEBKIT_CONTEXT_MENU_ACTION_SPELLING_GUESS:
Modified: releases/WebKitGTK/webkit-2.2/Source/WebKit2/UIProcess/API/gtk/WebKitContextMenuActions.h (155436 => 155437)
--- releases/WebKitGTK/webkit-2.2/Source/WebKit2/UIProcess/API/gtk/WebKitContextMenuActions.h 2013-09-10 13:36:26 UTC (rev 155436)
+++ releases/WebKitGTK/webkit-2.2/Source/WebKit2/UIProcess/API/gtk/WebKitContextMenuActions.h 2013-09-10 13:39:52 UTC (rev 155437)
@@ -72,6 +72,8 @@
* @WEBKIT_CONTEXT_MENU_ACTION_MEDIA_PLAY: Play current media element.
* @WEBKIT_CONTEXT_MENU_ACTION_MEDIA_PAUSE: Pause current media element.
* @WEBKIT_CONTEXT_MENU_ACTION_MEDIA_MUTE: Mute current media element.
+ * @WEBKIT_CONTEXT_MENU_ACTION_DOWNLOAD_VIDEO_TO_DISK: Download video to disk.
+ * @WEBKIT_CONTEXT_MENU_ACTION_DOWNLOAD_AUDIO_TO_DISK: Download audio to disk.
* @WEBKIT_CONTEXT_MENU_ACTION_CUSTOM: Custom action defined by applications.
*
* Enum values used to denote the stock actions for
@@ -121,6 +123,8 @@
WEBKIT_CONTEXT_MENU_ACTION_MEDIA_PLAY,
WEBKIT_CONTEXT_MENU_ACTION_MEDIA_PAUSE,
WEBKIT_CONTEXT_MENU_ACTION_MEDIA_MUTE,
+ WEBKIT_CONTEXT_MENU_ACTION_DOWNLOAD_VIDEO_TO_DISK,
+ WEBKIT_CONTEXT_MENU_ACTION_DOWNLOAD_AUDIO_TO_DISK,
WEBKIT_CONTEXT_MENU_ACTION_CUSTOM = 10000
} WebKitContextMenuAction;
Modified: releases/WebKitGTK/webkit-2.2/Source/WebKit2/UIProcess/API/gtk/tests/TestContextMenu.cpp (155436 => 155437)
--- releases/WebKitGTK/webkit-2.2/Source/WebKit2/UIProcess/API/gtk/tests/TestContextMenu.cpp 2013-09-10 13:36:26 UTC (rev 155436)
+++ releases/WebKitGTK/webkit-2.2/Source/WebKit2/UIProcess/API/gtk/tests/TestContextMenu.cpp 2013-09-10 13:39:52 UTC (rev 155437)
@@ -309,6 +309,7 @@
iter = checkCurrentItemIsSeparatorAndGetNext(iter);
iter = checkCurrentItemIsStockActionAndGetNext(iter, WEBKIT_CONTEXT_MENU_ACTION_COPY_VIDEO_LINK_TO_CLIPBOARD, Visible | Enabled);
iter = checkCurrentItemIsStockActionAndGetNext(iter, WEBKIT_CONTEXT_MENU_ACTION_OPEN_VIDEO_IN_NEW_WINDOW, Visible | Enabled);
+ iter = checkCurrentItemIsStockActionAndGetNext(iter, WEBKIT_CONTEXT_MENU_ACTION_DOWNLOAD_VIDEO_TO_DISK, Visible | Enabled);
break;
case Editable:
g_assert(!webkit_hit_test_result_context_is_link(hitTestResult));
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
