Integrate Surface requests with MediaPlayerRenderer

content/renderer/media/android/media_player_renderer_client.cc

 // Copyright 2016 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/renderer/media/android/media_player_renderer_client.h"
 
 #include "base/callback_helpers.h"
 
 namespace content {
 
@@ skipping 40 matching lines @@
 
 void MediaPlayerRendererClient::InitializeRemoteRenderer(
     media::DemuxerStreamProvider* demuxer_stream_provider) {
   DCHECK(media_task_runner_->BelongsToCurrentThread());
   mojo_renderer_->Initialize(
       demuxer_stream_provider, this,
       base::Bind(&MediaPlayerRendererClient::CompleteInitialization,
                  weak_factory_.GetWeakPtr()));
 }
 
+void MediaPlayerRendererClient::OnScopedSurfaceRequested(
+    const base::Optional<base::UnguessableToken>& request_token) {
+  if (!request_token) {
+    // No request was registered in the browser.
+    // The MojoRendererService was not constructed with an
+    // InitiateSurfaceRequestCB. This means that the renderer in the browser
+    // process likely isn't a MediaPlayerRenderer.
+    NOTREACHED();
+    return;
+  }
+
+  stream_texture_wrapper_->ForwardStreamTextureForSurfaceRequest(
+      request_token.value());
+}
+
 void MediaPlayerRendererClient::CompleteInitialization(
     media::PipelineStatus status) {
   DCHECK(media_task_runner_->BelongsToCurrentThread());
   DCHECK(!init_cb_.is_null());
 
-  // TODO(tguilbert): Register |stream_texture_wrapper_|'s surface and send it
-  // to MediaPlayerRenderer via |mojo_renderer_|. See crbug.com/627658.
+  // TODO(tguilbert): Measure and smooth out the initialization's ordering to
+  // have the lowest total initialization time.
+  mojo_renderer_->InitiateScopedSurfaceRequest(
+      base::Bind(&MediaPlayerRendererClient::OnScopedSurfaceRequested,
+                 weak_factory_.GetWeakPtr()));
 
   base::ResetAndReturn(&init_cb_).Run(status);
 }
 
 void MediaPlayerRendererClient::SetCdm(
     media::CdmContext* cdm_context,
     const media::CdmAttachedCB& cdm_attached_cb) {
   NOTREACHED();
 }
 
@@ skipping 70 matching lines @@
 
 void MediaPlayerRendererClient::OnVideoOpacityChange(bool opaque) {
   client_->OnVideoOpacityChange(opaque);
 }
 
 void MediaPlayerRendererClient::OnDurationChange(base::TimeDelta duration) {
   client_->OnDurationChange(duration);
 }
 
 }  // namespace content