Chromium Code Reviews| Index: gpu/command_buffer/client/gpu_memory_buffer.h |
| diff --git a/ui/gl/gpu_memory_buffer.h b/gpu/command_buffer/client/gpu_memory_buffer.h |
| similarity index 83% |
| rename from ui/gl/gpu_memory_buffer.h |
| rename to gpu/command_buffer/client/gpu_memory_buffer.h |
| index 9780c97104728a8c18d9767ab4416137f0d7098e..c675d1050b908ac45bb7c4437c7dc1b5e194e771 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>(uint32, uint32)> Creator; |
|
joth
2013/04/18 21:18:34
Size is 'int' and gpu/ tends to use GLsizei (also
|
| 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_ |