Move MediaPlayerAction to WebMediaPlayerAction. Switch to an enum and a...

webkit/glue/webview_impl.cc

 // Copyright (c) 2007-2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 #include "build/build_config.h"
 
 #include "base/compiler_specific.h"
 MSVC_PUSH_WARNING_LEVEL(0);
 #include "CSSStyleSelector.h"
@@ skipping 45 matching lines @@
 #include "TypingCommand.h"
 MSVC_POP_WARNING();
 #undef LOG
 
 #include "base/gfx/rect.h"
 #include "base/keyboard_codes.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "webkit/api/public/WebDragData.h"
 #include "webkit/api/public/WebInputEvent.h"
+#include "webkit/api/public/WebMediaPlayerAction.h"
 #include "webkit/api/public/WebPoint.h"
 #include "webkit/api/public/WebRect.h"
 #include "webkit/api/public/WebString.h"
 #include "webkit/api/src/WebInputEventConversion.h"
 #include "webkit/api/src/WebSettingsImpl.h"
 #include "webkit/glue/dom_operations.h"
 #include "webkit/glue/glue_serialize.h"
 #include "webkit/glue/glue_util.h"
 #include "webkit/glue/image_resource_fetcher.h"
-#include "webkit/glue/media_player_action.h"
 #include "webkit/glue/searchable_form_data.h"
 #include "webkit/glue/webdevtoolsagent_impl.h"
 #include "webkit/glue/webkit_glue.h"
 #include "webkit/glue/webpopupmenu_impl.h"
 #include "webkit/glue/webdevtoolsagent.h"
 #include "webkit/glue/webdevtoolsclient.h"
 #include "webkit/glue/webview_delegate.h"
 #include "webkit/glue/webview_impl.h"
 
 // Get rid of WTF's pow define so we can use std::pow.
@@ skipping 11 matching lines @@
 using WebKit::WebCompositionCommandDiscard;
 using WebKit::WebDragData;
 using WebKit::WebDragOperation;
 using WebKit::WebDragOperationCopy;
 using WebKit::WebDragOperationNone;
 using WebKit::WebDragOperationsMask;
 using WebKit::WebFrame;
 using WebKit::WebFrameClient;
 using WebKit::WebInputEvent;
 using WebKit::WebKeyboardEvent;
+using WebKit::WebMediaPlayerAction;
 using WebKit::WebMouseEvent;
 using WebKit::WebMouseWheelEvent;
 using WebKit::WebNavigationPolicy;
 using WebKit::WebPoint;
 using WebKit::WebRect;
 using WebKit::WebSettings;
 using WebKit::WebSettingsImpl;
 using WebKit::WebSize;
 using WebKit::WebString;
 using WebKit::WebTextDirection;
@@ skipping 1293 matching lines @@
 
 void WebViewImpl::zoomDefault() {
   // We don't change the zoom mode (text only vs. full page) here. We just want
   // to reset whatever is already set.
   zoom_level_ = 0;
   main_frame()->frame()->setZoomFactor(
       1.0f,
       main_frame()->frame()->isZoomFactorTextOnly());
 }
 
+void WebViewImpl::performMediaPlayerAction(const WebMediaPlayerAction& action,
+                                           const WebPoint& location) {
+  HitTestResult result =
+      HitTestResultForWindowPos(webkit_glue::WebPointToIntPoint(location));
+  WTF::RefPtr<WebCore::Node> node = result.innerNonSharedNode();
+  if (!node->hasTagName(WebCore::HTMLNames::videoTag) &&
+      !node->hasTagName(WebCore::HTMLNames::audioTag))
+    return;
+
+  WTF::RefPtr<WebCore::HTMLMediaElement> media_element =
+      static_pointer_cast<WebCore::HTMLMediaElement>(node);
+  switch (action.type) {
+    case WebMediaPlayerAction::Play:
+      if (action.enable) {
+        media_element->play();
+      } else {
+        media_element->pause();
+      }
+      break;
+    case WebMediaPlayerAction::Mute:
+      media_element->setMuted(action.enable);
+      break;
+    case WebMediaPlayerAction::Loop:
+      media_element->setLoop(action.enable);
+      break;
+    default:
+      ASSERT_NOT_REACHED();
+  }
+}
+
 void WebViewImpl::copyImageAt(const WebPoint& point) {
   if (!page_.get())
     return;
 
   HitTestResult result =
       HitTestResultForWindowPos(webkit_glue::WebPointToIntPoint(point));
 
   if (result.absoluteImageURL().isEmpty()) {
     // There isn't actually an image at these coordinates.  Might be because
     // the window scrolled while the context menu was open or because the page
@@ skipping 279 matching lines @@
   }
 
   // Future frames check this to know whether to be transparent.
   is_transparent_ = is_transparent;
 }
 
 bool WebViewImpl::isTransparent() const {
   return is_transparent_;
 }
 
-void WebViewImpl::MediaPlayerActionAt(int x,
-                                      int y,
-                                      const MediaPlayerAction& action) {
-  HitTestResult result = HitTestResultForWindowPos(IntPoint(x, y));
-
-  WTF::RefPtr<WebCore::Node> node = result.innerNonSharedNode();
-  if (node->hasTagName(WebCore::HTMLNames::videoTag) ||
-      node->hasTagName(WebCore::HTMLNames::audioTag)) {
-    WTF::RefPtr<WebCore::HTMLMediaElement> media_element =
-        static_pointer_cast<WebCore::HTMLMediaElement>(node);
-    if (action.command & MediaPlayerAction::PLAY) {
-      media_element->play();
-    }
-    if (action.command & MediaPlayerAction::PAUSE) {
-      media_element->pause();
-    }
-    if (action.command & MediaPlayerAction::MUTE) {
-      media_element->setMuted(true);
-    }
-    if (action.command & MediaPlayerAction::UNMUTE) {
-      media_element->setMuted(false);
-    }
-    if (action.command & MediaPlayerAction::LOOP) {
-      media_element->setLoop(true);
-    }
-    if (action.command & MediaPlayerAction::NO_LOOP) {
-      media_element->setLoop(false);
-    }
-  }
-}
-
 void WebViewImpl::setIsActive(bool active) {
   if (page() && page()->focusController())
     page()->focusController()->setActive(active);
 }
 
 bool WebViewImpl::isActive() const {
   return (page() && page()->focusController())
       ? page()->focusController()->isActive()
       : false;
 }
@@ skipping 138 matching lines @@
       hitTestResultAtPoint(doc_point, false);
 }
 
 void WebViewImpl::setTabsToLinks(bool enable) {
   tabs_to_links_ = enable;
 }
 
 bool WebViewImpl::tabsToLinks() const {
   return tabs_to_links_;
 }