gpu: Add support for GLX_EXT_texture_from_pixmap extension.

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 <vector>
 
 #include "base/hash_tables.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop_proxy.h"
 #include "build/build_config.h"
 #include "content/common/gpu/gpu_memory_manager.h"
 #include "ipc/ipc_listener.h"
@@ skipping 71 matching lines @@
 
   GpuMemoryManager* gpu_memory_manager() { return &gpu_memory_manager_; }
 
   GpuChannel* LookupChannel(int32 client_id);
 
   SyncPointManager* sync_point_manager() { return sync_point_manager_; }
 
   gfx::GLSurface* GetDefaultOffscreenSurface();
 
  private:
+  typedef std::pair<int32, base::Closure> ImageOperation;

[piman, 2012/10/17 17:46:20]

nit: we usually avoid std::pair except for implicit types. Rather, a simple
struct (with a trivial constructor if it's useful) is usually better because it
gives proper names to the fields. For example, here, it's very difficult to know
if the first parameter represents an image ID, a client ID or a sync point.
Where it gets used, we have to mentally translate "first" and "second" into
whichever field this is meant to be.

+
   // Message handlers.
   void OnEstablishChannel(int client_id, bool share_context);
   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);
+  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 OnLoseAllContexts();
 
   scoped_refptr<base::MessageLoopProxy> io_message_loop_;
   base::WaitableEvent* shutdown_event_;
 
   // Used to send and receive IPC messages from the browser process.
   ChildThread* gpu_child_thread_;
 
   // These objects manage channels to individual renderer processes there is
   // one channel for each renderer process that has connected to this GPU
   // process.
   typedef base::hash_map<int, scoped_refptr<GpuChannel> > GpuChannelMap;
   GpuChannelMap gpu_channels_;
   scoped_refptr<gfx::GLShareGroup> share_group_;
   scoped_refptr<gpu::gles2::MailboxManager> mailbox_manager_;
   GpuMemoryManager gpu_memory_manager_;
   GpuWatchdog* watchdog_;
   scoped_refptr<SyncPointManager> sync_point_manager_;
   scoped_ptr<gpu::gles2::ProgramCache> program_cache_;
   scoped_refptr<gfx::GLSurface> default_offscreen_surface_;
+  typedef std::deque<ImageOperation> ImageOperationQueue;

[piman, 2012/10/17 17:46:20]

nit: typedefs usually go together at the top of the "private" section.
(agreed this file isn't very consistent with this)

+  ImageOperationQueue image_operations_;
 
   DISALLOW_COPY_AND_ASSIGN(GpuChannelManager);
 };
 
 #endif  // CONTENT_COMMON_GPU_GPU_CHANNEL_MANAGER_H_