Make GpuMemoryBufferFactory a function pointer rather than a callback.

BUG=175012

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

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

6 files changed, 0 insertions, 64 deletions

diff --git a/gpu/command_buffer/client/gles2_implementation.cc b/gpu/command_buffer/client/gles2_implementation.cc
index e7dbdc2..9e86b0f 100644
--- a/gpu/command_buffer/client/gles2_implementation.cc
+++ b/gpu/command_buffer/client/gles2_implementation.cc
@@ -17,7 +17,6 @@
 #include <GLES2/gl2extchromium.h>
 #include "../client/buffer_tracker.h"
 #include "../client/gpu_memory_buffer.h"
-#include "../client/gpu_memory_buffer_factory.h"
 #include "../client/gpu_memory_buffer_tracker.h"
 #include "../client/mapped_memory.h"
 #include "../client/program_info_manager.h"
diff --git a/gpu/command_buffer/client/gpu_memory_buffer.h b/gpu/command_buffer/client/gpu_memory_buffer.h
index b388f47..480eb89 100644
--- a/gpu/command_buffer/client/gpu_memory_buffer.h
+++ b/gpu/command_buffer/client/gpu_memory_buffer.h
@@ -6,7 +6,6 @@
 #define GPU_COMMAND_BUFFER_CLIENT_GPU_MEMORY_BUFFER_H_
 
 #include "base/basictypes.h"
-#include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
 #include "gles2_impl_export.h"
 
@@ -23,7 +22,6 @@ namespace gpu {
 // behavior and is not allowed.
 class GLES2_IMPL_EXPORT GpuMemoryBuffer {
  public:
-  typedef base::Callback<scoped_ptr<GpuMemoryBuffer>(int, int)> Creator;
   enum AccessMode {
     READ_ONLY,
     WRITE_ONLY,
diff --git a/gpu/command_buffer/client/gpu_memory_buffer_factory.cc b/gpu/command_buffer/client/gpu_memory_buffer_factory.cc
deleted file mode 100644
index 57fcef7..0000000
--- a/gpu/command_buffer/client/gpu_memory_buffer_factory.cc
+++ /dev/null
@@ -1,29 +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 "gpu/command_buffer/client/gpu_memory_buffer_factory.h"
-
-#include "base/logging.h"
-
-namespace gpu {
-namespace gles2 {
-
-namespace {
-GpuMemoryBuffer::Creator* g_gpu_memory_buffer_factory_ = NULL;
-}
-
-const GpuMemoryBuffer::Creator& GetProcessDefaultGpuMemoryBufferFactory() {
-  DCHECK(g_gpu_memory_buffer_factory_ != NULL);
-  return *g_gpu_memory_buffer_factory_;
-}
-
-void SetProcessDefaultGpuMemoryBufferFactory(
-    const GpuMemoryBuffer::Creator& factory) {
-  DCHECK(g_gpu_memory_buffer_factory_ == NULL);
-  // TODO(kaanb): move the ownership of this memory to android_webview
-  g_gpu_memory_buffer_factory_ = new GpuMemoryBuffer::Creator(factory);
-}
-
-}  // namespace gles2
-}  // namespace gpu
diff --git a/gpu/command_buffer/client/gpu_memory_buffer_factory.h b/gpu/command_buffer/client/gpu_memory_buffer_factory.h
deleted file mode 100644
index 191a2e2..0000000
--- a/gpu/command_buffer/client/gpu_memory_buffer_factory.h
+++ /dev/null
@@ -1,29 +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 GPU_COMMAND_BUFFER_CLIENT_GPU_MEMORY_BUFFER_FACTORY_H_
-#define GPU_COMMAND_BUFFER_CLIENT_GPU_MEMORY_BUFFER_FACTORY_H_
-
-#include "gles2_impl_export.h"
-#include "gpu/command_buffer/client/gpu_memory_buffer.h"
-
-namespace gpu {
-namespace gles2 {
-
-// Getter and setter for a GpuMemoryBuffer factory for the current process.
-// Currently it is only used for Android Webview where both browser and
-// renderer are within the same process.
-
-// It is not valid to call this method before the setter is called.
-GLES2_IMPL_EXPORT const GpuMemoryBuffer::Creator&
-    GetProcessDefaultGpuMemoryBufferFactory();
-
-// It is illegal to call the setter more than once.
-GLES2_IMPL_EXPORT void SetProcessDefaultGpuMemoryBufferFactory(
-    const GpuMemoryBuffer::Creator& factory);
-
-}  // namespace gles2
-}  // namespace gpu
-
-#endif  // GPU_COMMAND_BUFFER_CLIENT_GPU_MEMORY_BUFFER_FACTORY_H_
diff --git a/gpu/command_buffer/tests/gl_gpu_memory_buffer_unittests.cc b/gpu/command_buffer/tests/gl_gpu_memory_buffer_unittests.cc
index 1598094..ae2ec10 100644
--- a/gpu/command_buffer/tests/gl_gpu_memory_buffer_unittests.cc
+++ b/gpu/command_buffer/tests/gl_gpu_memory_buffer_unittests.cc
@@ -10,7 +10,6 @@
 #include "base/bind.h"
 #include "base/memory/ref_counted.h"
 #include "gpu/command_buffer/client/gles2_implementation.h"
-#include "gpu/command_buffer/client/gpu_memory_buffer_factory.h"
 #include "gpu/command_buffer/client/gpu_memory_buffer_mock.h"
 #include "gpu/command_buffer/client/image_factory_mock.h"
 #include "gpu/command_buffer/service/image_manager.h"
diff --git a/gpu/gpu_common.gypi b/gpu/gpu_common.gypi
index 577c81b..14b4921 100644
--- a/gpu/gpu_common.gypi
+++ b/gpu/gpu_common.gypi
@@ -37,8 +37,6 @@
       'command_buffer/client/gles2_trace_implementation.h',
       'command_buffer/client/gles2_trace_implementation_impl_autogen.h',
       'command_buffer/client/gpu_memory_buffer.h',
-      'command_buffer/client/gpu_memory_buffer_factory.cc',
-      'command_buffer/client/gpu_memory_buffer_factory.h',
       'command_buffer/client/gpu_memory_buffer_tracker.h',
       'command_buffer/client/gpu_memory_buffer_tracker.cc',
       'command_buffer/client/image_factory.h',