Changeset 155345 in webkit

Timestamp:

Sep 9, 2013 6:05:26 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[GTK][WK2] Update ContextMenu Download API
​https://bugs.webkit.org/show_bug.cgi?id=120763

Patch by Brian Holt <​brian.holt@samsung.com> on 2013-09-09
Reviewed by Carlos Garcia Campos.

Mark the new Download items in the Context Menu with the Since
tag, and include a unit test for Context Menu audio.

• UIProcess/API/gtk/WebKitContextMenuActions.h:
• UIProcess/API/gtk/tests/TestContextMenu.cpp:

(testContextMenuDefaultMenu):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/gtk/WebKitContextMenuActions.h (modified) (1 diff)
• UIProcess/API/gtk/tests/TestContextMenu.cpp (modified) (4 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-09-09  Brian Holt  <brian.holt@samsung.com>
+
+        [GTK][WK2] Update ContextMenu Download API
+        https://bugs.webkit.org/show_bug.cgi?id=120763
+
+        Reviewed by Carlos Garcia Campos.
+
+        Mark the new Download items in the Context Menu with the Since
+        tag, and include a unit test for Context Menu audio.
+
+        * UIProcess/API/gtk/WebKitContextMenuActions.h:
+        * UIProcess/API/gtk/tests/TestContextMenu.cpp:
+        (testContextMenuDefaultMenu):
+
 2013-09-08  Christophe Dumez  <ch.dumez@sisa.samsung.com>
 

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

@@ -73 +73 @@
  * @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_DOWNLOAD_VIDEO_TO_DISK: Download video to disk. Since 2.2
+ * @WEBKIT_CONTEXT_MENU_ACTION_DOWNLOAD_AUDIO_TO_DISK: Download audio to disk. Since 2.2
  * @WEBKIT_CONTEXT_MENU_ACTION_CUSTOM: Custom action defined by applications.
  *

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

@@ -239 +239 @@
         LinkImage,
         Video,
+        Audio,
         Editable
     };
@@ -312 +313 @@
             iter = checkCurrentItemIsStockActionAndGetNext(iter, WEBKIT_CONTEXT_MENU_ACTION_DOWNLOAD_VIDEO_TO_DISK, Visible | Enabled);
             break;
+        case Audio:
+            g_assert(!webkit_hit_test_result_context_is_link(hitTestResult));
+            g_assert(!webkit_hit_test_result_context_is_image(hitTestResult));
+            g_assert(webkit_hit_test_result_context_is_media(hitTestResult));
+            g_assert(!webkit_hit_test_result_context_is_editable(hitTestResult));
+            iter = checkCurrentItemIsStockActionAndGetNext(iter, WEBKIT_CONTEXT_MENU_ACTION_MEDIA_PLAY, Visible | Enabled);
+            iter = checkCurrentItemIsStockActionAndGetNext(iter, WEBKIT_CONTEXT_MENU_ACTION_MEDIA_MUTE, Visible);
+            iter = checkCurrentItemIsStockActionAndGetNext(iter, WEBKIT_CONTEXT_MENU_ACTION_TOGGLE_MEDIA_CONTROLS, Visible | Enabled | Checked);
+            iter = checkCurrentItemIsStockActionAndGetNext(iter, WEBKIT_CONTEXT_MENU_ACTION_TOGGLE_MEDIA_LOOP, Visible | Enabled);
+            iter = checkCurrentItemIsStockActionAndGetNext(iter, WEBKIT_CONTEXT_MENU_ACTION_ENTER_VIDEO_FULLSCREEN, Visible);
+            iter = checkCurrentItemIsSeparatorAndGetNext(iter);
+            iter = checkCurrentItemIsStockActionAndGetNext(iter, WEBKIT_CONTEXT_MENU_ACTION_COPY_AUDIO_LINK_TO_CLIPBOARD, Visible | Enabled);
+            iter = checkCurrentItemIsStockActionAndGetNext(iter, WEBKIT_CONTEXT_MENU_ACTION_OPEN_AUDIO_IN_NEW_WINDOW, Visible | Enabled);
+            iter = checkCurrentItemIsStockActionAndGetNext(iter, WEBKIT_CONTEXT_MENU_ACTION_DOWNLOAD_AUDIO_TO_DISK, Visible | Enabled);
+            break;
         case Editable:
             g_assert(!webkit_hit_test_result_context_is_link(hitTestResult));
@@ -358 +374 @@
         " <input style='position:absolute; left:1; top:30' size='10'></input>"
         " <video style='position:absolute; left:1; top:50' width='300' height='300' controls='controls' preload='none'><source src='movie.ogg' type='video/ogg' /></video>"
+        " <audio style='position:absolute; left:1; top:60' width='50' height='20' controls='controls' preload='none'><source src='track.mp3' type='audio/mp3' /></audio>"
         "</body></html>";
     test->loadHtml(linksHTML, "file:///");
@@ -382 +399 @@
     test->showContextMenuAtPositionAndWaitUntilFinished(1, 20);
 
-    // Context menu for image video.
+    // Context menu for video.
     test->m_expectedMenuType = ContextMenuDefaultTest::Video;
     test->showContextMenuAtPositionAndWaitUntilFinished(1, 50);
+
+    // Context menu for audio.
+    test->m_expectedMenuType = ContextMenuDefaultTest::Audio;
+    test->showContextMenuAtPositionAndWaitUntilFinished(1, 60);
 
     // Context menu for editable.