Update StreamTextureProxy to accept a base::Closure

content/renderer/media/android/stream_texture_factory.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 CONTENT_RENDERER_MEDIA_ANDROID_STREAM_TEXTURE_FACTORY_H_
 #define CONTENT_RENDERER_MEDIA_ANDROID_STREAM_TEXTURE_FACTORY_H_
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 19 matching lines @@
 class ContextProviderCommandBuffer;
 class StreamTextureFactory;
 
 // The proxy class for the gpu thread to notify the compositor thread
 // when a new video frame is available.
 class StreamTextureProxy : public StreamTextureHost::Listener {
  public:
   ~StreamTextureProxy() override;
 
   // Initialize and bind to the loop, which becomes the thread that
   // a connected client will receive callbacks on. This can be called

[watk, 2016/07/29 19:03:16]

update docs

[tguilbert, 2016/08/01 22:05:57]

Done.

   // on any thread, but must be called with the same loop every time.
   void BindToLoop(int32_t stream_id,

[watk, 2016/07/29 19:03:16]

tangential: we should rename this at some point to BindToTaskRunner

[tguilbert, 2016/08/01 22:05:57]

Done.

[watk, 2016/08/01 22:30:03]

Thanks for doing it in this CL :)

-                  cc::VideoFrameProvider::Client* client,
+                  const base::Closure& received_frame_cb,
                   scoped_refptr<base::SingleThreadTaskRunner> loop);

[watk, 2016/08/01 22:30:03]

s/loop/task_runner

[tguilbert, 2016/08/01 23:03:18]

Done.

 
   // StreamTextureHost::Listener implementation:
   void OnFrameAvailable() override;
 
   struct Deleter {
     inline void operator()(StreamTextureProxy* ptr) const { ptr->Release(); }
   };
  private:
   friend class StreamTextureFactory;
   explicit StreamTextureProxy(StreamTextureHost* host);
 
   void BindOnThread(int32_t stream_id);
   void Release();
 
   const std::unique_ptr<StreamTextureHost> host_;
 
-  // Protects access to |client_| and |loop_|.
+  // Protects access to |received_frame_cb_| and |loop_|.
   base::Lock lock_;
-  cc::VideoFrameProvider::Client* client_;
+  base::Closure received_frame_cb_;
   scoped_refptr<base::SingleThreadTaskRunner> loop_;

[watk, 2016/08/01 22:30:03]

s/loop_/task_runner_/ (and docs above)

[tguilbert, 2016/08/01 23:03:18]

Done.

 
   DISALLOW_IMPLICIT_CONSTRUCTORS(StreamTextureProxy);
 };
 
 typedef std::unique_ptr<StreamTextureProxy, StreamTextureProxy::Deleter>
     ScopedStreamTextureProxy;
 
 // Factory class for managing stream textures.
 class CONTENT_EXPORT StreamTextureFactory
     : public base::RefCounted<StreamTextureFactory> {
@@ skipping 30 matching lines @@
 
   scoped_refptr<ContextProviderCommandBuffer> context_provider_;
   scoped_refptr<gpu::GpuChannelHost> channel_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(StreamTextureFactory);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_MEDIA_ANDROID_STREAM_TEXTURE_FACTORY_H_