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..06f0d0736291bbac500bbe08eb267dbd8324e66b 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,12 @@ 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() {
+  CancelScopedSurfaceRequest();
+}
 
 void MediaPlayerRenderer::Initialize(
     media::DemuxerStreamProvider* demuxer_stream_provider,
@@ -57,9 +61,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 +101,36 @@ 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));
+}
+
+void MediaPlayerRenderer::CancelScopedSurfaceRequest() {

[liberato (no reviews please), 2016/09/21 14:33:28]

nit: might want to move this to be in the order in the .h file, or at least
after Initiate...().  kinda unexpected to have 'cancel' first.

[tguilbert, 2016/09/21 20:26:58]

Done.

+  if (is_waiting_for_surface_) {

[liberato (no reviews please), 2016/09/21 14:33:28]

seems like chromium tends to early-out and save the {} indentation.  i.e., "if
(!is...) return"

[tguilbert, 2016/09/21 20:26:58]

Done.

+    ScopedSurfaceRequestManager::GetInstance()->UnregisterScopedSurfaceRequest(
+        surface_request_token_);
+    surface_request_token_ = base::UnguessableToken();
+    is_waiting_for_surface_ = false;
+  }
+}
+
+base::UnguessableToken MediaPlayerRenderer::InitiateScopedSurfaceRequest() {
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
+
+  CancelScopedSurfaceRequest();
+
+  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);
 }