Make RendererMediaPlayerManager a RenderFrameObserver.

content/browser/android/child_process_launcher_android.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/android/child_process_launcher_android.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "content/browser/media/android/browser_media_player_manager.h"
+#include "content/browser/media/android/media_web_contents_observer.h"
 #include "content/browser/renderer_host/compositor_impl_android.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/common/content_switches.h"
 #include "jni/ChildProcessLauncher_jni.h"
 #include "media/base/android/media_player_android.h"
 #include "ui/gl/android/scoped_java_surface.h"
 
 using base::android::AttachCurrentThread;
 using base::android::ToJavaArrayOfStrings;
 using base::android::ScopedJavaGlobalRef;
 using base::android::ScopedJavaLocalRef;
 using content::StartChildProcessCallback;
 
 namespace content {
 
 namespace {
 
 // Pass a java surface object to the MediaPlayerAndroid object
 // identified by render process handle, render view ID and player ID.

[jam, 2014/05/20 00:34:49]

nit: update to render frame ID

[xhwang, 2014/05/22 19:06:00]

Done.

 static void SetSurfacePeer(
     const base::android::JavaRef<jobject>& surface,
     base::ProcessHandle render_process_handle,
     int render_view_id,
     int player_id) {
   int renderer_id = 0;
   RenderProcessHost::iterator it = RenderProcessHost::AllHostsIterator();
   while (!it.IsAtEnd()) {
     if (it.GetCurrentValue()->GetHandle() == render_process_handle) {
       renderer_id = it.GetCurrentValue()->GetID();
       break;
     }
     it.Advance();
   }
 
-  if (renderer_id) {
-    RenderViewHostImpl* host = RenderViewHostImpl::FromID(
-        renderer_id, render_view_id);
-    if (host) {
-      media::MediaPlayerAndroid* player =
-          host->media_player_manager()->GetPlayer(player_id);
-      if (player &&
-          player != host->media_player_manager()->GetFullscreenPlayer()) {
-        gfx::ScopedJavaSurface scoped_surface(surface);
-        player->SetVideoSurface(scoped_surface.Pass());
-      }
-    }
+  if (!renderer_id) {
+    DVLOG(1) << "Cannot find renderer for " << render_process_handle;
+    return;
+  }
+
+  RenderViewHostImpl* host =
+      RenderViewHostImpl::FromID(renderer_id, render_view_id);
+
+  if (!host) {
+    DVLOG(1) << "Cannot find host for render_view" << render_view_id;
+    return;
+  }
+
+  // TODO(xhwang): This assumes all media elements are in the main frame which
+  // is not true. Update the SetSurfacePeer() stack to use |render_frame_id|
+  // instead of |render_view_id|.

[xhwang, 2014/05/12 17:01:58]

qinmin: let me know if this TODO makes sense ;)

[jam, 2014/05/20 00:34:49]

hmm, this is going to be broken in the meantime. why can't this be fixed in this
cl?

[xhwang, 2014/05/22 19:06:00]

Done.

+  RenderFrameHost* frame = host->GetMainFrame();
+  if (!frame) {
+    DVLOG(1) << "Cannot find the main frame.";
+    return;
+  }
+
+  BrowserMediaPlayerManager* player_manager =
+      host->media_web_contents_observer()->GetMediaPlayerManager(frame);
+  if (!player_manager) {
+    DVLOG(1) << "Cannot find the media player manager for frame " << frame;
+    return;
+  }
+
+  media::MediaPlayerAndroid* player = player_manager->GetPlayer(player_id);
+  if (!player) {
+    DVLOG(1) << "Cannot find the media player player_id " << player_id;
+    return;
+  }
+
+  if (player != player_manager->GetFullscreenPlayer()) {
+    gfx::ScopedJavaSurface scoped_surface(surface);
+    player->SetVideoSurface(scoped_surface.Pass());
   }
 }
 
 }  // anonymous namespace
 
 // Called from ChildProcessLauncher.java when the ChildProcess was
 // started.
 // |client_context| is the pointer to StartChildProcessCallback which was
 // passed in from StartChildProcess.
 // |handle| is the processID of the child process as originated in Java, 0 if
@@ skipping 122 matching lines @@
 
 jboolean IsSingleProcess(JNIEnv* env, jclass clazz) {
   return CommandLine::ForCurrentProcess()->HasSwitch(switches::kSingleProcess);
 }
 
 bool RegisterChildProcessLauncher(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace content