Integrate Surface requests with MediaPlayerRenderer

media/mojo/clients/mojo_renderer.h

 // Copyright 2014 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 MEDIA_MOJO_CLIENTS_MOJO_RENDERER_H_
 #define MEDIA_MOJO_CLIENTS_MOJO_RENDERER_H_
 
 #include <stdint.h>
 
 #include "base/macros.h"
 #include "base/time/default_tick_clock.h"
+#include "base/unguessable_token.h"
 #include "media/base/demuxer_stream.h"
 #include "media/base/renderer.h"
 #include "media/base/time_delta_interpolator.h"
 #include "media/mojo/interfaces/renderer.mojom.h"
 #include "mojo/public/cpp/bindings/binding.h"
 
 namespace base {
 class SingleThreadTaskRunner;
 }
 
@@ skipping 29 matching lines @@
   void SetCdm(CdmContext* cdm_context,
               const CdmAttachedCB& cdm_attached_cb) override;
   void Flush(const base::Closure& flush_cb) override;
   void StartPlayingFrom(base::TimeDelta time) override;
   void SetPlaybackRate(double playback_rate) override;
   void SetVolume(float volume) override;
   base::TimeDelta GetMediaTime() override;
   bool HasAudio() override;
   bool HasVideo() override;
 
+  using ReceiveSurfaceRequestTokenCB =
+      base::Callback<void(const base::Optional<base::UnguessableToken>&)>;
+
+  // Asks |remote_renderer_| to register a request in the browser's
+  // ScopedSurfaceRequestManager, and returns the request's token.
+  void InitiateScopedSurfaceRequest(
+      ReceiveSurfaceRequestTokenCB receive_request_token_cb);
+
  private:
   // mojom::RendererClient implementation, dispatched on the
   // |task_runner_|.
   void OnTimeUpdate(base::TimeDelta time,
                     base::TimeDelta max_time,
                     base::TimeTicks capture_time) override;
   void OnBufferingStateChange(mojom::BufferingState state) override;
   void OnEnded() override;
   void OnError() override;
   void OnVideoNaturalSizeChange(const gfx::Size& size) override;
@@ skipping 66 matching lines @@
 
   // Binding for RendererClient, bound to the |task_runner_|.
   mojo::Binding<RendererClient> binding_;
 
   bool encountered_error_ = false;
 
   PipelineStatusCB init_cb_;
   base::Closure flush_cb_;
   CdmAttachedCB cdm_attached_cb_;
 
   // Lock used to serialize access for |time_interpolator_|.

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

time_interpolator_ => media_time_interpolator_.  also, perhaps move
|media_clock_| out of the way if it's not protected by |lock_|.  or, if it is,
then it should probably be in the comment.

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

I think you may have been looking at the patch-patch diff, rather than the
base-patch diff. I didn't touch this part of the code, and it only showed up
because there was a rebase and a long time between patches.

Actual changes in this file:
https://codereview.chromium.org/2282633002/diff/120001/media/mojo/clients/moj...

Is there anything that you think should actually be adressed in this portion of
the code though? I will be happy to tweak it in another review.

   mutable base::Lock lock_;
   base::DefaultTickClock media_clock_;
   media::TimeDeltaInterpolator media_time_interpolator_;
 
   DISALLOW_COPY_AND_ASSIGN(MojoRenderer);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_MOJO_CLIENTS_MOJO_RENDERER_H_