summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--android_webview/browser/DEPS2
-rw-r--r--android_webview/browser/gpu_memory_buffer_factory_impl.cc11
-rw-r--r--android_webview/browser/gpu_memory_buffer_factory_impl.h9
-rw-r--r--android_webview/browser/gpu_memory_buffer_impl.cc4
-rw-r--r--android_webview/browser/gpu_memory_buffer_impl.h6
-rw-r--r--android_webview/public/browser/draw_gl.h2
-rw-r--r--android_webview/renderer/aw_content_renderer_client.h1
-rw-r--r--gpu/command_buffer/client/gpu_memory_buffer.h (renamed from ui/gl/gpu_memory_buffer.h)13
-rw-r--r--gpu/command_buffer/client/gpu_memory_buffer_factory.cc8
-rw-r--r--gpu/command_buffer/client/gpu_memory_buffer_factory.h6
-rw-r--r--gpu/gpu_common.gypi5
-rw-r--r--ui/gl/gl.gyp1
12 files changed, 33 insertions, 35 deletions
diff --git a/android_webview/browser/DEPS b/android_webview/browser/DEPS
index a96e11d..cb5b561 100644
--- a/android_webview/browser/DEPS
+++ b/android_webview/browser/DEPS
@@ -12,7 +12,7 @@ include_rules = [
"+content/public/browser",
- "+gpu/command_buffer/client/gpu_memory_buffer_factory.h",
+ "+gpu/command_buffer/client",
"+ui/gfx",
"+ui/gl",
diff --git a/android_webview/browser/gpu_memory_buffer_factory_impl.cc b/android_webview/browser/gpu_memory_buffer_factory_impl.cc
index c860420..924fdefc 100644
--- a/android_webview/browser/gpu_memory_buffer_factory_impl.cc
+++ b/android_webview/browser/gpu_memory_buffer_factory_impl.cc
@@ -5,12 +5,17 @@
#include "android_webview/browser/gpu_memory_buffer_factory_impl.h"
#include "android_webview/browser/gpu_memory_buffer_impl.h"
+#include "base/logging.h"
+#include "ui/gfx/size.h"
namespace android_webview {
-scoped_ptr<gfx::GpuMemoryBuffer> CreateGpuMemoryBuffer(gfx::Size size) {
- scoped_ptr<GpuMemoryBufferImpl> result(new GpuMemoryBufferImpl(size));
- return result.PassAs<gfx::GpuMemoryBuffer>();
+scoped_ptr<gpu::GpuMemoryBuffer> CreateGpuMemoryBuffer(int width, int height) {
+ DCHECK(width > 0);
+ DCHECK(height > 0);
+ scoped_ptr<GpuMemoryBufferImpl> result(new GpuMemoryBufferImpl(
+ gfx::Size(width, height)));
+ return result.PassAs<gpu::GpuMemoryBuffer>();
}
} // namespace android_webview
diff --git a/android_webview/browser/gpu_memory_buffer_factory_impl.h b/android_webview/browser/gpu_memory_buffer_factory_impl.h
index 545053b..ba55146 100644
--- a/android_webview/browser/gpu_memory_buffer_factory_impl.h
+++ b/android_webview/browser/gpu_memory_buffer_factory_impl.h
@@ -5,17 +5,12 @@
#ifndef ANDROID_WEBVIEW_BROWSER_GPU_MEMORY_BUFFER_FACTORY_IMPL_H_
#define ANDROID_WEBVIEW_BROWSER_GPU_MEMORY_BUFFER_FACTORY_IMPL_H_
-#include "base/compiler_specific.h"
#include "base/memory/scoped_ptr.h"
-#include "ui/gl/gpu_memory_buffer.h"
-
-namespace gfx {
-class Size;
-}
+#include "gpu/command_buffer/client/gpu_memory_buffer.h"
namespace android_webview {
-scoped_ptr<gfx::GpuMemoryBuffer> CreateGpuMemoryBuffer(gfx::Size size);
+scoped_ptr<gpu::GpuMemoryBuffer> CreateGpuMemoryBuffer(int width, int height);
} // namespace android_webview
diff --git a/android_webview/browser/gpu_memory_buffer_impl.cc b/android_webview/browser/gpu_memory_buffer_impl.cc
index 5430503..b44de8c 100644
--- a/android_webview/browser/gpu_memory_buffer_impl.cc
+++ b/android_webview/browser/gpu_memory_buffer_impl.cc
@@ -8,9 +8,9 @@
#include "android_webview/public/browser/draw_gl.h"
#include "base/bind.h"
#include "base/logging.h"
+#include "gpu/command_buffer/client/gpu_memory_buffer.h"
#include "gpu/command_buffer/client/gpu_memory_buffer_factory.h"
#include "ui/gfx/size.h"
-#include "ui/gl/gpu_memory_buffer.h"
namespace android_webview {
@@ -29,7 +29,7 @@ GpuMemoryBufferImpl::~GpuMemoryBufferImpl() {
buffer_id_ = 0;
}
-void GpuMemoryBufferImpl::Map(gfx::GpuMemoryBuffer::AccessMode mode,
+void GpuMemoryBufferImpl::Map(gpu::GpuMemoryBuffer::AccessMode mode,
void** vaddr) {
DCHECK(buffer_id_ != 0);
int err = g_gl_draw_functions->lock(buffer_id_, mode, vaddr);
diff --git a/android_webview/browser/gpu_memory_buffer_impl.h b/android_webview/browser/gpu_memory_buffer_impl.h
index bd4e436..493c140 100644
--- a/android_webview/browser/gpu_memory_buffer_impl.h
+++ b/android_webview/browser/gpu_memory_buffer_impl.h
@@ -7,21 +7,21 @@
#include "base/basictypes.h"
#include "base/compiler_specific.h"
+#include "gpu/command_buffer/client/gpu_memory_buffer.h"
#include "ui/gfx/size.h"
-#include "ui/gl/gpu_memory_buffer.h"
struct AwDrawGLFunctionTable;
namespace android_webview {
-class GpuMemoryBufferImpl : public gfx::GpuMemoryBuffer {
+class GpuMemoryBufferImpl : public gpu::GpuMemoryBuffer {
public:
static void SetAwDrawGLFunctionTable(AwDrawGLFunctionTable* table);
GpuMemoryBufferImpl(gfx::Size size);
virtual ~GpuMemoryBufferImpl();
// methods from GpuMemoryBuffer
- virtual void Map(gfx::GpuMemoryBuffer::AccessMode mode,
+ virtual void Map(gpu::GpuMemoryBuffer::AccessMode mode,
void** vaddr) OVERRIDE;
virtual void Unmap() OVERRIDE;
virtual void* GetNativeBuffer() OVERRIDE;
diff --git a/android_webview/public/browser/draw_gl.h b/android_webview/public/browser/draw_gl.h
index 4c43669..1d124c8 100644
--- a/android_webview/public/browser/draw_gl.h
+++ b/android_webview/public/browser/draw_gl.h
@@ -83,7 +83,7 @@ typedef int AwCreateGraphicBufferFunction(int w, int h);
// Called to release a GraphicBuffer
typedef void AwReleaseGraphicBufferFunction(int buffer_id);
// Called to lock a GraphicBuffer in |mode|, which is
-// defined in AccessMode enum in ui/gl/gpu_memory_buffer.h
+// defined in AccessMode enum in gpu/command_buffer/client/gpu_memory_buffer.h
typedef int AwLockFunction(int buffer_id, int mode, void** vaddr);
// Called to unlock a GraphicBuffer
typedef int AwUnlockFunction(int buffer_id);
diff --git a/android_webview/renderer/aw_content_renderer_client.h b/android_webview/renderer/aw_content_renderer_client.h
index 53470fd..f224d5e 100644
--- a/android_webview/renderer/aw_content_renderer_client.h
+++ b/android_webview/renderer/aw_content_renderer_client.h
@@ -9,7 +9,6 @@
#include "android_webview/renderer/aw_render_process_observer.h"
#include "base/compiler_specific.h"
-#include "ui/gl/gpu_memory_buffer.h"
namespace components {
class VisitedLinkSlave;
diff --git a/ui/gl/gpu_memory_buffer.h b/gpu/command_buffer/client/gpu_memory_buffer.h
index 9780c97..0c75bdd 100644
--- a/ui/gl/gpu_memory_buffer.h
+++ b/gpu/command_buffer/client/gpu_memory_buffer.h
@@ -2,15 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef UI_GL_GPU_MEMORY_BUFFER_H_
-#define UI_GL_GPU_MEMORY_BUFFER_H_
+#ifndef GPU_COMMAND_BUFFER_CLIENT_GPU_MEMORY_BUFFER_H_
+#define GPU_COMMAND_BUFFER_CLIENT_GPU_MEMORY_BUFFER_H_
#include "base/basictypes.h"
#include "base/callback.h"
#include "base/memory/scoped_ptr.h"
-namespace gfx {
-class Size;
+namespace gpu {
// Interface for creating and accessing a zero-copy GPU memory buffer.
// This design evolved from the generalization of GraphicBuffer API
@@ -23,7 +22,7 @@ class Size;
// behavior and is not allowed.
class GpuMemoryBuffer {
public:
- typedef base::Callback<scoped_ptr<gfx::GpuMemoryBuffer>(gfx::Size)> Creator;
+ typedef base::Callback<scoped_ptr<GpuMemoryBuffer>(int, int)> Creator;
enum AccessMode {
READ_ONLY,
WRITE_ONLY,
@@ -50,6 +49,6 @@ class GpuMemoryBuffer {
virtual uint32 GetStride() = 0;
};
-} // namespace gfx
+} // namespace gpu
-#endif // UI_GL_GPU_MEMORY_BUFFER_H_
+#endif // GPU_COMMAND_BUFFER_CLIENT_GPU_MEMORY_BUFFER_H_
diff --git a/gpu/command_buffer/client/gpu_memory_buffer_factory.cc b/gpu/command_buffer/client/gpu_memory_buffer_factory.cc
index 26404b5..c0e5b9f 100644
--- a/gpu/command_buffer/client/gpu_memory_buffer_factory.cc
+++ b/gpu/command_buffer/client/gpu_memory_buffer_factory.cc
@@ -9,17 +9,17 @@
namespace gpu {
namespace {
-gfx::GpuMemoryBuffer::Creator* g_gpu_memory_buffer_factory_ = NULL;
+GpuMemoryBuffer::Creator* g_gpu_memory_buffer_factory_ = NULL;
}
-const gfx::GpuMemoryBuffer::Creator& GetProcessDefaultGpuMemoryBufferFactory() {
+const GpuMemoryBuffer::Creator& GetProcessDefaultGpuMemoryBufferFactory() {
return *g_gpu_memory_buffer_factory_;
}
void SetProcessDefaultGpuMemoryBufferFactory(
- const gfx::GpuMemoryBuffer::Creator& factory) {
+ const GpuMemoryBuffer::Creator& factory) {
DCHECK(g_gpu_memory_buffer_factory_ == NULL);
- g_gpu_memory_buffer_factory_ = new gfx::GpuMemoryBuffer::Creator(factory);
+ g_gpu_memory_buffer_factory_ = new GpuMemoryBuffer::Creator(factory);
}
} // namespace gpu
diff --git a/gpu/command_buffer/client/gpu_memory_buffer_factory.h b/gpu/command_buffer/client/gpu_memory_buffer_factory.h
index a2df559..db15743 100644
--- a/gpu/command_buffer/client/gpu_memory_buffer_factory.h
+++ b/gpu/command_buffer/client/gpu_memory_buffer_factory.h
@@ -5,8 +5,8 @@
#ifndef GPU_COMMAND_BUFFER_CLIENT_GPU_MEMORY_BUFFER_FACTORY_H_
#define GPU_COMMAND_BUFFER_CLIENT_GPU_MEMORY_BUFFER_FACTORY_H_
-#include "ui/gl/gpu_memory_buffer.h"
#include "gles2_impl_export.h"
+#include "gpu/command_buffer/client/gpu_memory_buffer.h"
namespace gpu {
@@ -15,11 +15,11 @@ namespace gpu {
// renderer are within the same process.
// It is not valid to call this method before the setter is called.
-const gfx::GpuMemoryBuffer::Creator& GetProcessDefaultGpuMemoryBufferFactory();
+const GpuMemoryBuffer::Creator& GetProcessDefaultGpuMemoryBufferFactory();
// It is illegal to call the setter more than once.
GLES2_IMPL_EXPORT void SetProcessDefaultGpuMemoryBufferFactory(
- const gfx::GpuMemoryBuffer::Creator& factory);
+ const GpuMemoryBuffer::Creator& factory);
} // namespace gpu
diff --git a/gpu/gpu_common.gypi b/gpu/gpu_common.gypi
index a2b563c..432457b 100644
--- a/gpu/gpu_common.gypi
+++ b/gpu/gpu_common.gypi
@@ -25,8 +25,6 @@
'command_buffer/client/client_context_state.cc',
'command_buffer/client/client_context_state_autogen.h',
'command_buffer/client/client_context_state_impl_autogen.h',
- 'command_buffer/client/gpu_memory_buffer_factory.cc',
- 'command_buffer/client/gpu_memory_buffer_factory.h',
'command_buffer/client/gles2_impl_export.h',
'command_buffer/client/gles2_implementation_autogen.h',
'command_buffer/client/gles2_implementation.cc',
@@ -38,6 +36,9 @@
'command_buffer/client/gles2_trace_implementation.cc',
'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/program_info_manager.cc',
'command_buffer/client/program_info_manager.h',
'command_buffer/client/query_tracker.cc',
diff --git a/ui/gl/gl.gyp b/ui/gl/gl.gyp
index b67a60a..ef2e9f0 100644
--- a/ui/gl/gl.gyp
+++ b/ui/gl/gl.gyp
@@ -97,7 +97,6 @@
'gl_surface_osmesa.h',
'gl_switches.cc',
'gl_switches.h',
- 'gpu_memory_buffer.h',
'gpu_switching_manager.cc',
'gpu_switching_manager.h',
'safe_shared_memory_pool.h',
generated by cgit v1.1 at 2025-03-11 03:07:30 +0000