Integrate Surface requests with MediaPlayerRenderer

media/mojo/services/mojo_renderer_service.cc

Index: media/mojo/services/mojo_renderer_service.cc
diff --git a/media/mojo/services/mojo_renderer_service.cc b/media/mojo/services/mojo_renderer_service.cc
index c41c90511a33cbafb574081a2c115e08a29b85a7..ce23233b8be2d9549c08d1f072ff23d3144a8a25 100644
--- a/media/mojo/services/mojo_renderer_service.cc
+++ b/media/mojo/services/mojo_renderer_service.cc
@@ -7,6 +7,7 @@
 #include <utility>
 
 #include "base/bind.h"
+#include "base/optional.h"
 #include "media/base/audio_renderer_sink.h"
 #include "media/base/media_keys.h"
 #include "media/base/media_url_demuxer.h"
@@ -24,13 +25,15 @@ MojoRendererService::MojoRendererService(
     base::WeakPtr<MojoCdmServiceContext> mojo_cdm_service_context,
     scoped_refptr<AudioRendererSink> audio_sink,
     std::unique_ptr<VideoRendererSink> video_sink,
-    std::unique_ptr<media::Renderer> renderer)
+    std::unique_ptr<media::Renderer> renderer,
+    InitiateSurfaceRequestCB initiate_surface_request_cb)
     : mojo_cdm_service_context_(mojo_cdm_service_context),
       state_(STATE_UNINITIALIZED),
       playback_rate_(0),
       audio_sink_(std::move(audio_sink)),
       video_sink_(std::move(video_sink)),
       renderer_(std::move(renderer)),
+      initiate_surface_request_cb_(initiate_surface_request_cb),
       weak_factory_(this) {
   DVLOG(1) << __FUNCTION__;
   DCHECK(renderer_);
@@ -236,4 +239,13 @@ void MojoRendererService::OnCdmAttached(
   callback.Run(success);
 }
 
+void MojoRendererService::InitiateScopedSurfaceRequest(
+    const InitiateScopedSurfaceRequestCallback& callback) {
+  if (initiate_surface_request_cb_.is_null()) {

[dcheng, 2016/09/26 17:41:51]

Isn't this always going to be true currently? I'm trying to understand how the
new code path is reached.

[tguilbert, 2016/09/26 19:46:35]

I will be enabling this new code path in the next CL that I send (behind a
compiler flag at first, and then as a replacement for WebMediaPlayerAndroid
entirely).

The CL in question will register a MojoRenderService at the RenderFrameHost
level on Android phones. The MojoRendererService will be given a callback
(binding a MediaPlayerRenderer and InitiateScopedSurfaceRequest()) at
construction time. The decision whether to construct a normal instance of
WebMediaPlayerImpl or one that uses the MediaPlayerRenderer will be made here
https://cs.chromium.org/chromium/src/content/renderer/render_frame_impl.cc?sq....

+    callback.Run(base::nullopt);
+    return;
+  }
+
+  callback.Run(initiate_surface_request_cb_.Run());
+}
 }  // namespace media