Move GpuMemoryBufferFactoryProxy to gpu/command_buffer/client as we'll be allocating buffers from gles2_implementation

BUG=175012


Review URL: https://chromiumcodereview.appspot.com/14009002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@193559 0039d316-1c4b-4281-b951-d872f2087c98

7 files changed, 5 insertions, 57 deletions

diff --git a/android_webview/android_webview.gyp b/android_webview/android_webview.gyp
index e2b6b6f8..32c1fa6 100644
--- a/android_webview/android_webview.gyp
+++ b/android_webview/android_webview.gyp
@@ -165,8 +165,6 @@
         'common/aw_resource.h',
         'common/aw_switches.cc',
         'common/aw_switches.h',
-        'common/gpu_memory_buffer_factory_proxy.cc',
-        'common/gpu_memory_buffer_factory_proxy.h',
         'common/render_view_messages.cc',
         'common/render_view_messages.h',
         'common/renderer_picture_map.cc',
diff --git a/android_webview/browser/DEPS b/android_webview/browser/DEPS
index 10625a3..a96e11d 100644
--- a/android_webview/browser/DEPS
+++ b/android_webview/browser/DEPS
@@ -12,6 +12,8 @@ include_rules = [
 
   "+content/public/browser",
 
+  "+gpu/command_buffer/client/gpu_memory_buffer_factory.h",
+
   "+ui/gfx",
   "+ui/gl",
 
diff --git a/android_webview/browser/gpu_memory_buffer_impl.cc b/android_webview/browser/gpu_memory_buffer_impl.cc
index d42b361..5430503 100644
--- a/android_webview/browser/gpu_memory_buffer_impl.cc
+++ b/android_webview/browser/gpu_memory_buffer_impl.cc
@@ -5,10 +5,10 @@
 #include "android_webview/browser/gpu_memory_buffer_impl.h"
 
 #include "android_webview/browser/gpu_memory_buffer_factory_impl.h"
-#include "android_webview/common/gpu_memory_buffer_factory_proxy.h"
 #include "android_webview/public/browser/draw_gl.h"
 #include "base/bind.h"
 #include "base/logging.h"
+#include "gpu/command_buffer/client/gpu_memory_buffer_factory.h"
 #include "ui/gfx/size.h"
 #include "ui/gl/gpu_memory_buffer.h"
 
@@ -56,7 +56,8 @@ uint32 GpuMemoryBufferImpl::GetStride() {
 void GpuMemoryBufferImpl::SetAwDrawGLFunctionTable(
     AwDrawGLFunctionTable* table) {
   g_gl_draw_functions = table;
-  SetGpuMemoryBufferFactoryProxy(base::Bind(&CreateGpuMemoryBuffer));
+  gpu::SetProcessDefaultGpuMemoryBufferFactory(
+      base::Bind(&CreateGpuMemoryBuffer));
 }
 
 }  // namespace android_webview
diff --git a/android_webview/common/gpu_memory_buffer_factory_proxy.cc b/android_webview/common/gpu_memory_buffer_factory_proxy.cc
deleted file mode 100644
index e10c042..0000000
--- a/android_webview/common/gpu_memory_buffer_factory_proxy.cc
+++ /dev/null
@@ -1,27 +0,0 @@
-// 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.
-
-#include "android_webview/common/gpu_memory_buffer_factory_proxy.h"
-
-#include "android_webview/common/aw_switches.h"
-#include "base/command_line.h"
-#include "base/logging.h"
-
-namespace android_webview {
-
-gfx::GpuMemoryBuffer::Create* g_pixel_buffer_factory_ = NULL;
-
-const gfx::GpuMemoryBuffer::Create& GetGpuMemoryBufferFactoryProxy() {
-  return *g_pixel_buffer_factory_;
-}
-
-void SetGpuMemoryBufferFactoryProxy(
-    const gfx::GpuMemoryBuffer::Create& factory) {
-  DCHECK(g_pixel_buffer_factory_ == NULL);
-  g_pixel_buffer_factory_ =
-      CommandLine::ForCurrentProcess()->HasSwitch(switches::kUseZeroCopyBuffers)
-      ? new gfx::GpuMemoryBuffer::Create(factory) : NULL;
-}
-
-}  // namespace android_webview
diff --git a/android_webview/common/gpu_memory_buffer_factory_proxy.h b/android_webview/common/gpu_memory_buffer_factory_proxy.h
deleted file mode 100644
index 8e24f18..0000000
--- a/android_webview/common/gpu_memory_buffer_factory_proxy.h
+++ /dev/null
@@ -1,19 +0,0 @@
-// 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 ANDROID_WEBVIEW_COMMON_GPU_MEMORY_BUFFER_FACTORY_PROXY_H_
-#define ANDROID_WEBVIEW_COMMON_GPU_MEMORY_BUFFER_FACTORY_PROXY_H_
-
-#include "base/basictypes.h"
-#include "ui/gl/gpu_memory_buffer.h"
-
-namespace android_webview {
-
-const gfx::GpuMemoryBuffer::Create& GetGpuMemoryBufferFactoryProxy();
-void SetGpuMemoryBufferFactoryProxy(
-    const gfx::GpuMemoryBuffer::Create& factory);
-
-}  // namespace android_webview
-
-#endif  // ANDROID_WEBVIEW_COMMON_GPU_MEMORY_BUFFER_FACTORY_PROXY_H_
diff --git a/android_webview/renderer/aw_content_renderer_client.cc b/android_webview/renderer/aw_content_renderer_client.cc
index 773ea6a..d37ba2d 100644
--- a/android_webview/renderer/aw_content_renderer_client.cc
+++ b/android_webview/renderer/aw_content_renderer_client.cc
@@ -5,7 +5,6 @@
 #include "android_webview/renderer/aw_content_renderer_client.h"
 
 #include "android_webview/common/aw_resource.h"
-#include "android_webview/common/gpu_memory_buffer_factory_proxy.h"
 #include "android_webview/common/url_constants.h"
 #include "android_webview/renderer/aw_render_view_ext.h"
 #include "android_webview/renderer/view_renderer.h"
@@ -108,9 +107,4 @@ bool AwContentRendererClient::ShouldCreateCompositorInputHandler() const {
   return should_create_compositor_input_handler_;
 }
 
-gfx::GpuMemoryBuffer::Create
-AwContentRendererClient::GetGpuMemoryBufferFactory() const {
-  return GetGpuMemoryBufferFactoryProxy();
-}
-
 }  // namespace android_webview
diff --git a/android_webview/renderer/aw_content_renderer_client.h b/android_webview/renderer/aw_content_renderer_client.h
index f616464..53470fd 100644
--- a/android_webview/renderer/aw_content_renderer_client.h
+++ b/android_webview/renderer/aw_content_renderer_client.h
@@ -43,7 +43,6 @@ class AwContentRendererClient : public content::ContentRendererClient {
   virtual void PrefetchHostName(const char* hostname, size_t length) OVERRIDE;
   virtual MessageLoop* OverrideCompositorMessageLoop() const OVERRIDE;
   virtual bool ShouldCreateCompositorInputHandler() const OVERRIDE;
-  virtual gfx::GpuMemoryBuffer::Create GetGpuMemoryBufferFactory() const;
 
  private:
   scoped_ptr<AwRenderProcessObserver> aw_render_process_observer_;