Integrate Surface requests with MediaPlayerRenderer

content/browser/media/android/media_player_renderer.h

 // 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.
 
 #ifndef CONTENT_BROWSER_MEDIA_ANDROID_MEDIA_PLAYER_RENDERER_H_
 #define CONTENT_BROWSER_MEDIA_ANDROID_MEDIA_PLAYER_RENDERER_H_
 
 #include "base/callback.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
+#include "base/unguessable_token.h"
 #include "content/common/content_export.h"
 #include "content/public/browser/render_frame_host.h"
 #include "media/base/android/media_player_bridge.h"
 #include "media/base/android/media_player_manager.h"
 #include "media/base/demuxer_stream_provider.h"
 #include "media/base/media_log.h"
 #include "media/base/renderer.h"
 #include "media/base/renderer_client.h"
 #include "url/gurl.h"
 
@@ skipping 57 matching lines @@
                       const base::TimeDelta& current_time) override;
   void OnError(int player_id, int error) override;
   void OnVideoSizeChanged(int player_id, int width, int height) override;
   void OnWaitingForDecryptionKey(int player_id) override;
   media::MediaPlayerAndroid* GetFullscreenPlayer() override;
   media::MediaPlayerAndroid* GetPlayer(int player_id) override;
   bool RequestPlay(int player_id,
                    base::TimeDelta duration,
                    bool has_audio) override;
 
+  base::UnguessableToken InitiateScopedSurfaceRequest();

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

this could use some comments, including that it cancels any pending request.

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

Yes, MB!

+  void OnScopedSurfaceRequestCompleted(gl::ScopedJavaSurface surface);
+
  private:
   // Used when creating |media_player_|.
   void OnDecoderResourcesReleased(int player_id);
 
+  void CancelScopedSurfaceRequest();

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

perhaps comment that it's okay if there isn't any outstanding request.

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

Agreed.

+
   RenderFrameHost* render_frame_host_;
   media::RendererClient* renderer_client_;
 
   std::unique_ptr<media::MediaPlayerBridge> media_player_;
 
   // Current duration of the media.
   base::TimeDelta duration_;
 
   // Indicates if a serious error has been encountered by the |media_player_|.
   bool has_error_;
 
   gfx::Size video_size_;
 
+  base::UnguessableToken surface_request_token_;
+  bool is_waiting_for_surface_;
+
   std::unique_ptr<media::MediaResourceGetter> media_resource_getter_;
 
   // NOTE: Weak pointers must be invalidated before all other member variables.
   base::WeakPtrFactory<MediaPlayerRenderer> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaPlayerRenderer);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_MEDIA_ANDROID_MEDIA_PLAYER_RENDERER_H_