Merge 21466 - Allow the browser to send actions back to the render for media ...

chrome/renderer/render_view.cc

 // Copyright (c) 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 "chrome/renderer/render_view.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 41 matching lines @@
 #include "grit/renderer_resources.h"
 #include "net/base/data_url.h"
 #include "net/base/escape.h"
 #include "net/base/net_errors.h"
 #include "skia/ext/bitmap_platform_device.h"
 #include "skia/ext/image_operations.h"
 #include "webkit/api/public/WebDataSource.h"
 #include "webkit/api/public/WebDragData.h"
 #include "webkit/api/public/WebForm.h"
 #include "webkit/api/public/WebHistoryItem.h"
+#include "webkit/api/public/WebNode.h"
 #include "webkit/api/public/WebPoint.h"
 #include "webkit/api/public/WebRect.h"
 #include "webkit/api/public/WebScriptSource.h"
 #include "webkit/api/public/WebSize.h"
 #include "webkit/api/public/WebURL.h"
 #include "webkit/api/public/WebURLError.h"
 #include "webkit/api/public/WebURLRequest.h"
 #include "webkit/api/public/WebURLResponse.h"
 #include "webkit/api/public/WebVector.h"
 #include "webkit/default_plugin/default_plugin_shared.h"
@@ skipping 344 matching lines @@
                         OnPopupNotificationVisibilityChanged)
     IPC_MESSAGE_HANDLER(ViewMsg_MoveOrResizeStarted, OnMoveOrResizeStarted)
     IPC_MESSAGE_HANDLER(ViewMsg_ExtensionResponse, OnExtensionResponse)
     IPC_MESSAGE_HANDLER(ViewMsg_ExtensionMessageInvoke,
                         OnExtensionMessageInvoke)
     IPC_MESSAGE_HANDLER(ViewMsg_ClearFocusedNode, OnClearFocusedNode)
     IPC_MESSAGE_HANDLER(ViewMsg_SetBackground, OnSetBackground)
     IPC_MESSAGE_HANDLER(ViewMsg_EnableIntrinsicWidthChangedMode,
                         OnEnableIntrinsicWidthChangedMode)
     IPC_MESSAGE_HANDLER(ViewMsg_SetRendererPrefs, OnSetRendererPrefs)
+    IPC_MESSAGE_HANDLER(ViewMsg_MediaPlayerActionAt, OnMediaPlayerActionAt)
 
     // Have the super handle all other messages.
     IPC_MESSAGE_UNHANDLED(RenderWidget::OnMessageReceived(message))
   IPC_END_MESSAGE_MAP()
 }
 
 void RenderView::SendThumbnail() {
   WebFrame* main_frame = webview()->GetMainFrame();
   if (!main_frame)
     return;
@@ skipping 1533 matching lines @@
   const WebHistoryItem& item =
       webview()->GetMainFrame()->GetCurrentHistoryItem();
   if (item.isNull())
     return;
 
   Send(new ViewHostMsg_UpdateState(
       routing_id_, page_id_, webkit_glue::HistoryItemToString(item)));
 }
 
 void RenderView::ShowContextMenu(WebView* webview,
-                                 ContextNode node,
+                                 ContextNodeType node_type,
                                  int x,
                                  int y,
                                  const GURL& link_url,
                                  const GURL& src_url,
                                  const GURL& page_url,
                                  const GURL& frame_url,
                                  const ContextMenuMediaParams& media_params,
                                  const std::wstring& selection_text,
                                  const std::wstring& misspelled_word,
                                  int edit_flags,
                                  const std::string& security_info,
                                  const std::string& frame_charset) {
   ContextMenuParams params;
-  params.node = node;
+  params.node_type = node_type;
   params.x = x;
   params.y = y;
   params.src_url = src_url;
   params.link_url = link_url;
   params.unfiltered_link_url = link_url;
   params.page_url = page_url;
   params.frame_url = frame_url;
   params.media_params = media_params;
   params.selection_text = selection_text;
   params.misspelled_word = misspelled_word;
@@ skipping 620 matching lines @@
 }
 
 void RenderView::OnEnableIntrinsicWidthChangedMode() {
   send_preferred_width_changes_ = true;
 }
 
 void RenderView::OnSetRendererPrefs(const RendererPreferences& renderer_prefs) {
   renderer_preferences_ = renderer_prefs;
 }
 
+void RenderView::OnMediaPlayerActionAt(int x,
+                                       int y,
+                                       const MediaPlayerAction& action) {
+  if (!webview())
+    return;
+
+  webview()->MediaPlayerActionAt(x, y, action);
+}
+
 void RenderView::OnUpdateBackForwardListCount(int back_list_count,
                                               int forward_list_count) {
   history_back_list_count_ = back_list_count;
   history_forward_list_count_ = forward_list_count;
 }
 
 void RenderView::OnGetAccessibilityInfo(
     const webkit_glue::WebAccessibility::InParams& in_params,
     webkit_glue::WebAccessibility::OutParams* out_params) {
 #if defined(OS_WIN)
@@ skipping 422 matching lines @@
     Send(new ViewHostMsg_PasswordFormsSeen(routing_id_, password_forms));
 }
 
 void RenderView::Print(WebFrame* frame, bool script_initiated) {
   DCHECK(frame);
   if (print_helper_.get() == NULL) {
     print_helper_.reset(new PrintWebViewHelper(this));
   }
   print_helper_->Print(frame, script_initiated);
 }