Index: gpu/ipc/service/gpu_memory_buffer_factory.h |
diff --git a/content/common/gpu/gpu_memory_buffer_factory.h b/gpu/ipc/service/gpu_memory_buffer_factory.h |
similarity index 80% |
rename from content/common/gpu/gpu_memory_buffer_factory.h |
rename to gpu/ipc/service/gpu_memory_buffer_factory.h |
index 566269f3a684974c67807ca6e3fdc5926d674fe2..beb278cb3725973380e4661bdc8a5cbd7cb871a8 100644 |
--- a/content/common/gpu/gpu_memory_buffer_factory.h |
+++ b/gpu/ipc/service/gpu_memory_buffer_factory.h |
@@ -2,26 +2,24 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#ifndef CONTENT_COMMON_GPU_GPU_MEMORY_BUFFER_FACTORY_H_ |
-#define CONTENT_COMMON_GPU_GPU_MEMORY_BUFFER_FACTORY_H_ |
+#ifndef GPU_IPC_SERVICE_GPU_MEMORY_BUFFER_FACTORY_H_ |
+#define GPU_IPC_SERVICE_GPU_MEMORY_BUFFER_FACTORY_H_ |
#include <vector> |
#include "base/macros.h" |
#include "base/memory/ref_counted.h" |
#include "base/memory/scoped_ptr.h" |
-#include "content/common/content_export.h" |
+#include "gpu/gpu_export.h" |
#include "gpu/ipc/common/surface_handle.h" |
#include "ui/gfx/geometry/size.h" |
#include "ui/gfx/gpu_memory_buffer.h" |
namespace gpu { |
-class ImageFactory; |
-} |
-namespace content { |
+class ImageFactory; |
-class CONTENT_EXPORT GpuMemoryBufferFactory { |
+class GPU_EXPORT GpuMemoryBufferFactory { |
public: |
virtual ~GpuMemoryBufferFactory() {} |
@@ -36,7 +34,7 @@ class CONTENT_EXPORT GpuMemoryBufferFactory { |
gfx::BufferFormat format, |
gfx::BufferUsage usage, |
int client_id, |
- gpu::SurfaceHandle surface_handle) = 0; |
+ SurfaceHandle surface_handle) = 0; |
// Creates a new GPU memory buffer instance from an existing handle. A valid |
// handle is returned on success. It can be called on any thread. |
@@ -53,7 +51,7 @@ class CONTENT_EXPORT GpuMemoryBufferFactory { |
int client_id) = 0; |
// Type-checking downcast routine. |
- virtual gpu::ImageFactory* AsImageFactory() = 0; |
+ virtual ImageFactory* AsImageFactory() = 0; |
protected: |
GpuMemoryBufferFactory() {} |
@@ -62,6 +60,6 @@ class CONTENT_EXPORT GpuMemoryBufferFactory { |
DISALLOW_COPY_AND_ASSIGN(GpuMemoryBufferFactory); |
}; |
-} // namespace content |
+} // namespace gpu |
-#endif // CONTENT_COMMON_GPU_GPU_MEMORY_BUFFER_FACTORY_H_ |
+#endif // GPU_IPC_SERVICE_GPU_MEMORY_BUFFER_FACTORY_H_ |