Route Pepper MediaSession messages to frames

content/browser/web_contents/web_contents_impl.cc

 // Copyright (c) 2012 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 "content/browser/web_contents/web_contents_impl.h"
 
 #include <stddef.h>
 
 #include <cmath>
 #include <utility>
@@ skipping 720 matching lines @@
     IPC_MESSAGE_HANDLER(FrameHostMsg_RegisterProtocolHandler,
                         OnRegisterProtocolHandler)
     IPC_MESSAGE_HANDLER(FrameHostMsg_UnregisterProtocolHandler,
                         OnUnregisterProtocolHandler)
     IPC_MESSAGE_HANDLER(FrameHostMsg_UpdatePageImportanceSignals,
                         OnUpdatePageImportanceSignals)
     IPC_MESSAGE_HANDLER(FrameHostMsg_Find_Reply, OnFindReply)
     IPC_MESSAGE_HANDLER(ViewHostMsg_AppCacheAccessed, OnAppCacheAccessed)
     IPC_MESSAGE_HANDLER(ViewHostMsg_WebUISend, OnWebUISend)
 #if BUILDFLAG(ENABLE_PLUGINS)
-    IPC_MESSAGE_HANDLER(FrameHostMsg_PepperInstanceCreated,
-                        OnPepperInstanceCreated)
-    IPC_MESSAGE_HANDLER(FrameHostMsg_PepperInstanceDeleted,
-                        OnPepperInstanceDeleted)
     IPC_MESSAGE_HANDLER(FrameHostMsg_PepperPluginHung, OnPepperPluginHung)
-    IPC_MESSAGE_HANDLER(FrameHostMsg_PepperStartsPlayback,
-                        OnPepperStartsPlayback)
-    IPC_MESSAGE_HANDLER(FrameHostMsg_PepperStopsPlayback,
-                        OnPepperStopsPlayback)
     IPC_MESSAGE_HANDLER(FrameHostMsg_PluginCrashed, OnPluginCrashed)
     IPC_MESSAGE_HANDLER(ViewHostMsg_RequestPpapiBrokerPermission,
                         OnRequestPpapiBrokerPermission)
     IPC_MESSAGE_HANDLER_GENERIC(BrowserPluginHostMsg_Attach,
                                 OnBrowserPluginMessage(render_frame_host,
                                                        message))
 #endif
     IPC_MESSAGE_HANDLER(ViewHostMsg_UpdateFaviconURL, OnUpdateFaviconURL)
     IPC_MESSAGE_HANDLER(ViewHostMsg_ShowValidationMessage,
                         OnShowValidationMessage)
     IPC_MESSAGE_HANDLER(ViewHostMsg_HideValidationMessage,
                         OnHideValidationMessage)
     IPC_MESSAGE_HANDLER(ViewHostMsg_MoveValidationMessage,
                         OnMoveValidationMessage)
 #if defined(OS_ANDROID)
     IPC_MESSAGE_HANDLER(FrameHostMsg_FindMatchRects_Reply,
                         OnFindMatchRectsReply)
     IPC_MESSAGE_HANDLER(FrameHostMsg_GetNearestFindResult_Reply,
                         OnGetNearestFindResultReply)
     IPC_MESSAGE_HANDLER(ViewHostMsg_OpenDateTimeDialog,
                         OnOpenDateTimeDialog)
 #endif
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
+
+#if BUILDFLAG(ENABLE_PLUGINS)
+  if (render_frame_host && !handled) {
+    handled = true;
+    // Maps for messages that need to be handled with |render_frame_host| as a
+    // parameter
+    IPC_BEGIN_MESSAGE_MAP_WITH_PARAM(WebContentsImpl, message,

[whywhat, 2016/12/06 01:37:31]

nit: change WebContentsImpl to RenderFrameHostImpl?

[Zhiqiang Zhang (Slow), 2016/12/06 12:05:56]

No longer applicable, this change is reverted.

+                                     render_frame_host)
+      IPC_MESSAGE_HANDLER(FrameHostMsg_PepperInstanceCreated,
+                          OnPepperInstanceCreated)
+      IPC_MESSAGE_HANDLER(FrameHostMsg_PepperInstanceDeleted,
+                          OnPepperInstanceDeleted)
+      IPC_MESSAGE_HANDLER(FrameHostMsg_PepperStartsPlayback,
+                          OnPepperStartsPlayback)
+      IPC_MESSAGE_HANDLER(FrameHostMsg_PepperStopsPlayback,
+                          OnPepperStopsPlayback)
+      IPC_MESSAGE_UNHANDLED(handled = false)
+    IPC_END_MESSAGE_MAP()
+  }
+#endif  // BUILDFLAG(ENABLE_PLUGINS)
+
   render_view_message_source_ = NULL;
   render_frame_message_source_ = NULL;
 
   return handled;
 }
 
 bool WebContentsImpl::HasValidFrameSource() {
   if (!render_frame_message_source_) {
     DCHECK(render_view_message_source_);
     bad_message::ReceivedBadMessage(GetRenderProcessHost(),
@@ skipping 2966 matching lines @@
 // This exists for render views that don't have a WebUI, but do have WebUI
 // bindings enabled.
 void WebContentsImpl::OnWebUISend(const GURL& source_url,
                                   const std::string& name,
                                   const base::ListValue& args) {
   if (delegate_)
     delegate_->WebUISend(this, source_url, name, args);
 }
 
 #if BUILDFLAG(ENABLE_PLUGINS)
-void WebContentsImpl::OnPepperInstanceCreated(int32_t pp_instance) {
+void WebContentsImpl::OnPepperInstanceCreated(
+    RenderFrameHost* render_frame_host, int32_t pp_instance) {
   for (auto& observer : observers_)
     observer.PepperInstanceCreated();
-  pepper_playback_observer_->PepperInstanceCreated(pp_instance);
+  pepper_playback_observer_->PepperInstanceCreated(
+      render_frame_host, pp_instance);

[whywhat, 2016/12/06 01:37:31]

Hm, it seems like you don't need to change the map above and just pass
render_frame_message_source_ here (which could be null in theory?). See the
comment before the original IPC_MESSAGE_MAP.

[Zhiqiang Zhang (Slow), 2016/12/06 12:05:56]

Didn't realize that. Thanks for pointing out. Done

 }
 
-void WebContentsImpl::OnPepperInstanceDeleted(int32_t pp_instance) {
+void WebContentsImpl::OnPepperInstanceDeleted(
+    RenderFrameHost* render_frame_host, int32_t pp_instance) {
   for (auto& observer : observers_)
     observer.PepperInstanceDeleted();
-  pepper_playback_observer_->PepperInstanceDeleted(pp_instance);
+  pepper_playback_observer_->PepperInstanceDeleted(
+      render_frame_host, pp_instance);
 }
 
 void WebContentsImpl::OnPepperPluginHung(int plugin_child_id,
                                          const base::FilePath& path,
                                          bool is_hung) {
   UMA_HISTOGRAM_COUNTS("Pepper.PluginHung", 1);
 
   for (auto& observer : observers_)
     observer.PluginHungStatusChanged(plugin_child_id, path, is_hung);
 }
 
-void WebContentsImpl::OnPepperStartsPlayback(int32_t pp_instance) {
-  pepper_playback_observer_->PepperStartsPlayback(pp_instance);
+void WebContentsImpl::OnPepperStartsPlayback(
+    RenderFrameHost* render_frame_host, int32_t pp_instance) {
+  pepper_playback_observer_->PepperStartsPlayback(
+      render_frame_host, pp_instance);
 }
 
-void WebContentsImpl::OnPepperStopsPlayback(int32_t pp_instance) {
-  pepper_playback_observer_->PepperStopsPlayback(pp_instance);
+void WebContentsImpl::OnPepperStopsPlayback(
+    RenderFrameHost* render_frame_host, int32_t pp_instance) {
+  pepper_playback_observer_->PepperStopsPlayback(
+      render_frame_host, pp_instance);
 }
 
 void WebContentsImpl::OnPluginCrashed(const base::FilePath& plugin_path,
                                       base::ProcessId plugin_pid) {
   for (auto& observer : observers_)
     observer.PluginCrashed(plugin_path, plugin_pid);
 }
 
 void WebContentsImpl::OnRequestPpapiBrokerPermission(
     int routing_id,
@@ skipping 1483 matching lines @@
   dialog_manager_ = dialog_manager;
 }
 
 void WebContentsImpl::RemoveBindingSet(const std::string& interface_name) {
   auto it = binding_sets_.find(interface_name);
   if (it != binding_sets_.end())
     binding_sets_.erase(it);
 }
 
 }  // namespace content