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

android_webview/browser/gpu_memory_buffer_factory_impl.h

Index: android_webview/browser/gpu_memory_buffer_factory_impl.h
diff --git a/android_webview/browser/gpu_memory_buffer_factory_impl.h b/android_webview/browser/gpu_memory_buffer_factory_impl.h
index b2c1feba755883a72f3684396b613bfdece770bc..929ba29bedab27a9a8d0b6f0c084b0947249ebc3 100644
--- a/android_webview/browser/gpu_memory_buffer_factory_impl.h
+++ b/android_webview/browser/gpu_memory_buffer_factory_impl.h
@@ -7,25 +7,29 @@
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
-#include "gpu/command_buffer/client/gpu_memory_buffer_factory.h"
+#include "gpu/command_buffer/service/in_process_command_buffer.h"
 
 struct AwDrawGLFunctionTable;
 
 namespace android_webview {
 
-class GpuMemoryBufferFactoryImpl : public gpu::GpuMemoryBufferFactory {
+class GpuMemoryBufferFactoryImpl : public gpu::InProcessGpuMemoryBufferFactory {
  public:
   GpuMemoryBufferFactoryImpl();
   virtual ~GpuMemoryBufferFactoryImpl();
 
   static void SetAwDrawGLFunctionTable(AwDrawGLFunctionTable* table);
 
-  // Overridden from gpu::GpuMemoryBufferFactory:
-  virtual gfx::GpuMemoryBuffer* CreateGpuMemoryBuffer(
+  // Overridden from gpu::InProcessGpuMemoryBufferFactory:
+  virtual scoped_ptr<gfx::GpuMemoryBuffer> AllocateGpuMemoryBuffer(
       size_t width,
       size_t height,
       unsigned internalformat,
       unsigned usage) OVERRIDE;
+  virtual scoped_refptr<gfx::GLImage> CreateImageForGpuMemoryBuffer(
+      const gfx::GpuMemoryBufferHandle& handle,
+      const gfx::Size& size,
+      unsigned internalformat) OVERRIDE;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(GpuMemoryBufferFactoryImpl);