Changeset 56415 in webkit

Timestamp:

Mar 23, 2010 2:15:40 PM (14 years ago)

Author:

eric@webkit.org

Message:

2010-03-23 Sergey Ulanov <​sergeyu@chromium.org>

Reviewed by Dmitry Titov.

Changes needed to implement Show/Hide Controls command for <video> in
chrome: (1) added Controls action in WebMediaPlayerAction that toggles
controls for media player, (2) added MediaHasVideo in
WebContextMenuData so that controls can be made toggleable only for
video player but not for audio.
​https://bugs.webkit.org/show_bug.cgi?id=36460

• public/WebContextMenuData.h: (WebKit::WebContextMenuData::):
• public/WebMediaPlayerAction.h: (WebKit::WebMediaPlayerAction::):
• src/ContextMenuClientImpl.cpp: (WebKit::ContextMenuClientImpl::getCustomMenuFromDefaultItems):
• src/WebViewImpl.cpp: (WebKit::WebViewImpl::performMediaPlayerAction):

Location:

trunk/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• public/WebContextMenuData.h (modified) (1 diff)
• public/WebMediaPlayerAction.h (modified) (1 diff)
• src/ContextMenuClientImpl.cpp (modified) (1 diff)
• src/WebViewImpl.cpp (modified) (1 diff)

trunk/WebKit/chromium/ChangeLog

@@ +1 @@
+2010-03-23  Sergey Ulanov  <sergeyu@chromium.org>
+
+        Reviewed by Dmitry Titov.
+
+        Changes needed to implement Show/Hide Controls command for <video> in
+        chrome: (1) added Controls action in WebMediaPlayerAction that toggles
+        controls for media player, (2) added MediaHasVideo in
+        WebContextMenuData so that controls can be made toggleable only for
+        video player but not for audio.
+        https://bugs.webkit.org/show_bug.cgi?id=36460
+
+        * public/WebContextMenuData.h:
+        (WebKit::WebContextMenuData::):
+        * public/WebMediaPlayerAction.h:
+        (WebKit::WebMediaPlayerAction::):
+        * src/ContextMenuClientImpl.cpp:
+        (WebKit::ContextMenuClientImpl::getCustomMenuFromDefaultItems):
+        * src/WebViewImpl.cpp:
+        (WebKit::WebViewImpl::performMediaPlayerAction):
+
 2010-03-23  Yury Semikhatsky  <yurys@chromium.org>
 

trunk/WebKit/chromium/public/WebContextMenuData.h

@@ -84 +84 @@
         MediaCanSave = 0x10,
         MediaHasAudio = 0x20,
+        MediaHasVideo = 0x40,
+        MediaControls = 0x80,
     };
 

trunk/WebKit/chromium/public/WebMediaPlayerAction.h

@@ -39 +39 @@
         Play,
         Mute,
-        Loop
+        Loop,
+        Controls
     };
 

trunk/WebKit/chromium/src/ContextMenuClientImpl.cpp

@@ -182 +182 @@
         if (mediaElement->hasAudio())
             data.mediaFlags |= WebContextMenuData::MediaHasAudio;
+        if (mediaElement->hasVideo())
+            data.mediaFlags |= WebContextMenuData::MediaHasVideo;
+        if (mediaElement->controls())
+            data.mediaFlags |= WebContextMenuData::MediaControls;
     }
 

trunk/WebKit/chromium/src/WebViewImpl.cpp

@@ -1453 +1453 @@
         mediaElement->setLoop(action.enable);
         break;
+    case WebMediaPlayerAction::Controls:
+        mediaElement->setControls(action.enable);
+        break;
     default:
         ASSERT_NOT_REACHED();