diff options
| author | kaanb@chromium.org <kaanb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-11 03:33:53 +0000 |
|---|---|---|
| committer | kaanb@chromium.org <kaanb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-11 03:33:53 +0000 |
| commit | dce2c4b407bbbfa0120441d3be88740e521db727 (patch) | |
| tree | f6969d219f8c65025cdfbe55daf242ad2783eb86 /android_webview/common | |
| parent | 08a139d1edd65efa8905883b39cf9a733e8a7363 (diff) | |
| download | chromium_src-dce2c4b407bbbfa0120441d3be88740e521db727.zip chromium_src-dce2c4b407bbbfa0120441d3be88740e521db727.tar.gz chromium_src-dce2c4b407bbbfa0120441d3be88740e521db727.tar.bz2 | |
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
Diffstat (limited to 'android_webview/common')
| -rw-r--r-- | android_webview/common/gpu_memory_buffer_factory_proxy.cc | 27 | ||||
| -rw-r--r-- | android_webview/common/gpu_memory_buffer_factory_proxy.h | 19 |
2 files changed, 0 insertions, 46 deletions
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_ |