Integrate Surface requests with MediaPlayerRenderer

content/browser/media/android/media_player_renderer.cc

Index: content/browser/media/android/media_player_renderer.cc
diff --git a/content/browser/media/android/media_player_renderer.cc b/content/browser/media/android/media_player_renderer.cc
index 3b7708bbce62af48e2a30ff7c2c19da426833f08..d53f2f817ea4cde0af62365784b5518b735a4d2a 100644
--- a/content/browser/media/android/media_player_renderer.cc
+++ b/content/browser/media/android/media_player_renderer.cc
@@ -6,6 +6,7 @@
 
 #include <memory>
 
+#include "content/browser/android/scoped_surface_request_manager.h"
 #include "content/browser/media/android/media_resource_getter_impl.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
@@ -23,9 +24,15 @@ namespace content {
 MediaPlayerRenderer::MediaPlayerRenderer(RenderFrameHost* render_frame_host)
     : render_frame_host_(render_frame_host),
       has_error_(false),
+      is_waiting_for_surface_(false),
       weak_factory_(this) {}
 
-MediaPlayerRenderer::~MediaPlayerRenderer() {}
+MediaPlayerRenderer::~MediaPlayerRenderer() {
+  if (is_waiting_for_surface_) {
+    ScopedSurfaceRequestManager::GetInstance()->UnregisterScopedSurfaceRequest(
+        surface_request_token_);
+  }
+}
 
 void MediaPlayerRenderer::Initialize(
     media::DemuxerStreamProvider* demuxer_stream_provider,
@@ -57,9 +64,6 @@ void MediaPlayerRenderer::Initialize(
       false,   // allow_crendentials
       0));     // media_session_id
 
-  // TODO(tguilbert): Register and Send the proper surface ID. See
-  // crbug.com/627658
-
   media_player_->Initialize();
   init_cb.Run(media::PIPELINE_OK);
 }
@@ -100,6 +104,26 @@ void MediaPlayerRenderer::SetPlaybackRate(double playback_rate) {
   }
 }
 
+void MediaPlayerRenderer::OnScopedSurfaceRequestCompleted(
+    gl::ScopedJavaSurface surface) {
+  DCHECK(is_waiting_for_surface_);
+  is_waiting_for_surface_ = false;
+  media_player_->SetVideoSurface(std::move(surface));

[liberato (no reviews please), 2016/09/15 19:40:40]

the ScopedSurfaceRequestManager automatically unregisters the request, right?

as in, a (broken / compromised) renderer might actually disobey the contract and
re-use the nonce.

[tguilbert, 2016/09/21 02:02:30]

Yes. Request tokens are one time uses, and the browser automatically unregisters
requests if an attempt to complete them was made.

+}
+
+base::Nonce MediaPlayerRenderer::InitiateScopedSurfaceRequest() {
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
+  DCHECK(!is_waiting_for_surface_);
+
+  is_waiting_for_surface_ = true;
+  surface_request_token_ =
+      ScopedSurfaceRequestManager::GetInstance()->RegisterScopedSurfaceRequest(
+          base::Bind(&MediaPlayerRenderer::OnScopedSurfaceRequestCompleted,
+                     weak_factory_.GetWeakPtr()));
+
+  return surface_request_token_;
+}
+
 void MediaPlayerRenderer::SetVolume(float volume) {
   media_player_->SetVolume(volume);
 }