Fix webrtc HW encode deadlock scenarios.

content/renderer/media/renderer_gpu_video_accelerator_factories.h

 // Copyright 2013 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_RENDERER_GPU_VIDEO_ACCELERATOR_FACTORIES_H_
 #define CONTENT_RENDERER_MEDIA_RENDERER_GPU_VIDEO_ACCELERATOR_FACTORIES_H_
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/synchronization/waitable_event.h"
+#include "content/child/thread_safe_sender.h"
 #include "content/common/content_export.h"
 #include "media/filters/gpu_video_accelerator_factories.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/size.h"
 
 namespace base {
 class MessageLoopProxy;
 class WaitableEvent;
 }
 
 namespace content {
 class GpuChannelHost;
 class WebGraphicsContext3DCommandBufferImpl;
 
 // Glue code to expose functionality needed by media::GpuVideoAccelerator to
 // RenderViewImpl.  This class is entirely an implementation detail of
 // RenderViewImpl and only has its own header to allow extraction of its
 // implementation from render_view_impl.cc which is already far too large.
 //
 // The public methods of the class can be called from any thread, and are
 // internally trampolined to the appropriate thread.  GPU/GL-related calls go to
-// the constructor-argument loop (the media thread), and shmem-related calls go
-// to the render thread.
+// the constructor-argument loop (the media thread).
 class CONTENT_EXPORT RendererGpuVideoAcceleratorFactories
     : public media::GpuVideoAcceleratorFactories {
  public:
   // Takes a ref on |gpu_channel_host| and tests |context| for loss before each
   // use.
   RendererGpuVideoAcceleratorFactories(
       GpuChannelHost* gpu_channel_host,
       const scoped_refptr<base::MessageLoopProxy>& message_loop,
       WebGraphicsContext3DCommandBufferImpl* wgc3dcbi);
 
@@ skipping 28 matching lines @@
   friend class base::RefCountedThreadSafe<RendererGpuVideoAcceleratorFactories>;
   virtual ~RendererGpuVideoAcceleratorFactories();
 
  private:
   RendererGpuVideoAcceleratorFactories();
 
   // Helper for the constructor to acquire the ContentGLContext on
   // |message_loop_|.
   void AsyncGetContext(WebGraphicsContext3DCommandBufferImpl* context);
 
-  // Async versions of the public methods.  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).
-  // AsyncCreateSharedMemory runs on the renderer thread and the rest run on
-  // |message_loop_|.
+  // 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.
   // AsyncCreateVideoEncodeAccelerator returns its output in the |vea_| member.
   void AsyncCreateVideoDecodeAccelerator(
       media::VideoCodecProfile profile,
       media::VideoDecodeAccelerator::Client* client);
   void AsyncCreateVideoEncodeAccelerator(
       media::VideoEncodeAccelerator::Client* client);
   void AsyncCreateTextures(int32 count,
                            const gfx::Size& size,
                            uint32 texture_target,
                            uint32* sync_point);
   void AsyncDeleteTexture(uint32 texture_id);
   void AsyncWaitSyncPoint(uint32 sync_point);
   void AsyncReadPixels(uint32 texture_id,
                        uint32 texture_target,
                        const gfx::Size& size);
-  void AsyncCreateSharedMemory(size_t size);
   void AsyncDestroyVideoDecodeAccelerator();
   void AsyncDestroyVideoEncodeAccelerator();
 
   scoped_refptr<base::MessageLoopProxy> message_loop_;
-  scoped_refptr<base::MessageLoopProxy> main_message_loop_;
   scoped_refptr<GpuChannelHost> gpu_channel_host_;
   base::WeakPtr<WebGraphicsContext3DCommandBufferImpl> context_;
 
+  // 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_;
 
-  // This event is signaled by asynchronous tasks posted to the renderer thread
-  // message loop to indicate their completion. e.g. AsyncCreateSharedMemory.
-  base::WaitableEvent render_thread_async_waiter_;
-
   // The vda returned by the CreateVideoDecodeAccelerator function.
   scoped_ptr<media::VideoDecodeAccelerator> vda_;
 
   // The vea returned by the CreateVideoEncodeAccelerator function.
   scoped_ptr<media::VideoEncodeAccelerator> vea_;
 
-  // Shared memory segment which is returned by the CreateSharedMemory()
-  // function.
-  scoped_ptr<base::SharedMemory> shared_memory_segment_;
-
   // 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_;
 
   DISALLOW_COPY_AND_ASSIGN(RendererGpuVideoAcceleratorFactories);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_MEDIA_RENDERER_GPU_VIDEO_ACCELERATOR_FACTORIES_H_