Remove threading from RendererGpuVideoAcceleratorFactories

content/renderer/media/renderer_gpu_video_accelerator_factories.h

Index: content/renderer/media/renderer_gpu_video_accelerator_factories.h
diff --git a/content/renderer/media/renderer_gpu_video_accelerator_factories.h b/content/renderer/media/renderer_gpu_video_accelerator_factories.h
index ca74eaa88e426a4fb0f143784be9925f0fba3843..4ee661aab882d8e3e06705a2157ebb88ebc98481 100644
--- a/content/renderer/media/renderer_gpu_video_accelerator_factories.h
+++ b/content/renderer/media/renderer_gpu_video_accelerator_factories.h
@@ -67,17 +67,12 @@ class CONTENT_EXPORT RendererGpuVideoAcceleratorFactories
                           const SkBitmap& pixels) OVERRIDE;
   virtual base::SharedMemory* CreateSharedMemory(size_t size) OVERRIDE;
   virtual scoped_refptr<base::MessageLoopProxy> GetMessageLoop() OVERRIDE;
-  virtual void Abort() OVERRIDE;
-  virtual bool IsAborted() OVERRIDE;
-  scoped_refptr<RendererGpuVideoAcceleratorFactories> Clone();
 
  protected:
   friend class base::RefCountedThreadSafe<RendererGpuVideoAcceleratorFactories>;
   virtual ~RendererGpuVideoAcceleratorFactories();
 
  private:
-  RendererGpuVideoAcceleratorFactories();
-
   // Helper to get a pointer to the WebGraphicsContext3DCommandBufferImpl,
   // if it has not been lost yet.
   WebGraphicsContext3DCommandBufferImpl* GetContext3d();
@@ -86,16 +81,13 @@ class CONTENT_EXPORT RendererGpuVideoAcceleratorFactories
   // |message_loop_|.
   void AsyncBindContext();
 
-  // Async versions of the public methods, run on |message_loop_|.
-  // They use output parameters instead of return values and each takes
-  // a WaitableEvent* param to signal completion (except for DeleteTexture,
-  // which is fire-and-forget).
-  // AsyncCreateVideoDecodeAccelerator returns its output in the |vda_| member.
-  void AsyncCreateVideoDecodeAccelerator(
-      media::VideoCodecProfile profile,
-      media::VideoDecodeAccelerator::Client* client);
-  void AsyncReadPixels(uint32 texture_id, const gfx::Size& size);
-  void AsyncDestroyVideoDecodeAccelerator();
+  // Async versions of ReadPixels, run on |message_loop_|.  It uses output
+  // parameters instead of return values and takes a base::WaitableEvent* param
+  // to signal completion.
+  void AsyncReadPixels(uint32 texture_id,
+                       const gfx::Size& size,
+                       const SkBitmap& pixels,
+                       base::WaitableEvent* waiter);
 
   scoped_refptr<base::MessageLoopProxy> message_loop_;
   scoped_refptr<GpuChannelHost> gpu_channel_host_;
@@ -104,20 +96,6 @@ class CONTENT_EXPORT RendererGpuVideoAcceleratorFactories
   // For sending requests to allocate shared memory in the Browser process.
   scoped_refptr<ThreadSafeSender> thread_safe_sender_;
 
-  // This event is signaled if we have been asked to Abort().
-  base::WaitableEvent aborted_waiter_;
-
-  // This event is signaled by asynchronous tasks posted to |message_loop_| to
-  // indicate their completion.
-  // e.g. AsyncCreateVideoDecodeAccelerator()/AsyncCreateTextures() etc.
-  base::WaitableEvent message_loop_async_waiter_;
-
-  // The vda returned by the CreateVideoDecodeAccelerator function.
-  scoped_ptr<media::VideoDecodeAccelerator> vda_;
-
-  // Bitmap returned by ReadPixels().
-  SkBitmap read_pixels_bitmap_;
-
   // Textures returned by the CreateTexture() function.
   std::vector<uint32> created_textures_;
   std::vector<gpu::Mailbox> created_texture_mailboxes_;

[Ami GONE FROM CHROMIUM, 2013/10/17 22:22:17]

Garbage

[sheu, 2013/10/21 05:17:35]

Removed with rebase.