gpu: Remove Create/DeleteImage IPC by adding an X11_PIXMAP_BUFFER GpuMemoryBuffer type.

content/common/gpu/gpu_channel_manager.h

 // Copyright (c) 2012 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_COMMON_GPU_GPU_CHANNEL_MANAGER_H_
 #define CONTENT_COMMON_GPU_GPU_CHANNEL_MANAGER_H_
 
 #include <deque>
 #include <string>
 #include <vector>
@@ skipping 29 matching lines @@
 }
 
 namespace IPC {
 struct ChannelHandle;
 }
 
 struct GPUCreateCommandBufferConfig;
 
 namespace content {
 class GpuChannel;
+class GpuMemoryBufferFactory;
 class GpuWatchdog;
 class MessageRouter;
 class SyncPointManager;
 
 // A GpuChannelManager is a thread responsible for issuing rendering commands
 // managing the lifetimes of GPU channels and forwarding IPC requests from the
 // browser process to them based on the corresponding renderer ID.
 class GpuChannelManager : public IPC::Listener,
                           public IPC::Sender {
  public:
@@ skipping 31 matching lines @@
   GpuEventsDispatcher* gpu_devtools_events_dispatcher() {
     return &gpu_devtools_events_dispatcher_;
   }
 
   GpuChannel* LookupChannel(int32 client_id);
 
   SyncPointManager* sync_point_manager() { return sync_point_manager_.get(); }
 
   gfx::GLSurface* GetDefaultOffscreenSurface();
 
+  GpuMemoryBufferFactory* gpu_memory_buffer_factory() {
+    return gpu_memory_buffer_factory_.get();
+  }
+
  private:
-  struct ImageOperation {
-    ImageOperation(int32 sync_point, base::Closure callback);
-    ~ImageOperation();
+  struct GpuMemoryBufferOperation {
+    GpuMemoryBufferOperation(int32 sync_point, base::Closure callback);
+    ~GpuMemoryBufferOperation();
 
     int32 sync_point;
     base::Closure callback;
   };
   typedef base::ScopedPtrHashMap<int, GpuChannel> GpuChannelMap;
-  typedef std::deque<ImageOperation*> ImageOperationQueue;
+  typedef std::deque<GpuMemoryBufferOperation*> GpuMemoryBufferOperationQueue;
 
   // Message handlers.
   void OnEstablishChannel(int client_id,
                           bool share_context,
                           bool allow_future_sync_points);
   void OnCloseChannel(const IPC::ChannelHandle& channel_handle);
   void OnVisibilityChanged(
       int32 render_view_id, int32 client_id, bool visible);
   void OnCreateViewCommandBuffer(
       const gfx::GLSurfaceHandle& window,
       int32 render_view_id,
       int32 client_id,
       const GPUCreateCommandBufferConfig& init_params,
       int32 route_id);
-  void CreateImage(
-      gfx::PluginWindowHandle window, int32 client_id, int32 image_id);
-  void OnCreateImage(
-      gfx::PluginWindowHandle window, int32 client_id, int32 image_id);
-  void DeleteImage(int32 client_id, int32 image_id);
-  void OnDeleteImage(int32 client_id, int32 image_id, int32 sync_point);
-  void OnDeleteImageSyncPointRetired(ImageOperation*);
   void OnLoadedShader(std::string shader);
+  void CreateGpuMemoryBuffer(const gfx::GpuMemoryBufferHandle& handle,
+                             const gfx::Size& size,
+                             unsigned internalformat,
+                             unsigned usage);
   void OnCreateGpuMemoryBuffer(const gfx::GpuMemoryBufferHandle& handle,
                                const gfx::Size& size,
                                unsigned internalformat,
                                unsigned usage);
+  void DestroyGpuMemoryBuffer(const gfx::GpuMemoryBufferHandle& handle);
   void OnDestroyGpuMemoryBuffer(const gfx::GpuMemoryBufferHandle& handle,
                                 int32 sync_point);
+  void OnDestroyGpuMemoryBufferSyncPointRetired(
+      GpuMemoryBufferOperation* gpu_memory_buffer_operation);
 
   void OnLoseAllContexts();
 
   scoped_refptr<base::MessageLoopProxy> io_message_loop_;
   base::WaitableEvent* shutdown_event_;
 
   // Used to send and receive IPC messages from the browser process.
   MessageRouter* const router_;
 
   // These objects manage channels to individual renderer processes there is
   // one channel for each renderer process that has connected to this GPU
   // process.
   GpuChannelMap gpu_channels_;
   scoped_refptr<gfx::GLShareGroup> share_group_;
   scoped_refptr<gpu::gles2::MailboxManager> mailbox_manager_;
   GpuMemoryManager gpu_memory_manager_;
   GpuEventsDispatcher gpu_devtools_events_dispatcher_;
   GpuWatchdog* watchdog_;
   scoped_refptr<SyncPointManager> sync_point_manager_;
   scoped_ptr<gpu::gles2::ProgramCache> program_cache_;
   scoped_refptr<gpu::gles2::ShaderTranslatorCache> shader_translator_cache_;
   scoped_refptr<gfx::GLSurface> default_offscreen_surface_;
-  ImageOperationQueue image_operations_;
+  GpuMemoryBufferOperationQueue gpu_memory_buffer_operations_;
+  scoped_ptr<GpuMemoryBufferFactory> gpu_memory_buffer_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(GpuChannelManager);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_COMMON_GPU_GPU_CHANNEL_MANAGER_H_