Index: gpu/ipc/service/gpu_memory_buffer_factory_surface_texture.h |
diff --git a/content/common/gpu/gpu_memory_buffer_factory_surface_texture.h b/gpu/ipc/service/gpu_memory_buffer_factory_surface_texture.h |
similarity index 74% |
rename from content/common/gpu/gpu_memory_buffer_factory_surface_texture.h |
rename to gpu/ipc/service/gpu_memory_buffer_factory_surface_texture.h |
index 0a535df6fe1d3b9ea3bf443fe00a8bad619636ed..4c7544bb98f8f8b5c7056fb8b55360fcb5116499 100644 |
--- a/content/common/gpu/gpu_memory_buffer_factory_surface_texture.h |
+++ b/gpu/ipc/service/gpu_memory_buffer_factory_surface_texture.h |
@@ -2,17 +2,17 @@ |
// 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_SURFACE_TEXTURE_H_ |
-#define CONTENT_COMMON_GPU_GPU_MEMORY_BUFFER_FACTORY_SURFACE_TEXTURE_H_ |
+#ifndef GPU_IPC_SERVICE_GPU_MEMORY_BUFFER_FACTORY_SURFACE_TEXTURE_H_ |
+#define GPU_IPC_SERVICE_GPU_MEMORY_BUFFER_FACTORY_SURFACE_TEXTURE_H_ |
#include <utility> |
#include "base/containers/hash_tables.h" |
#include "base/memory/ref_counted.h" |
#include "base/synchronization/lock.h" |
-#include "content/common/content_export.h" |
-#include "content/common/gpu/gpu_memory_buffer_factory.h" |
#include "gpu/command_buffer/service/image_factory.h" |
+#include "gpu/gpu_export.h" |
+#include "gpu/ipc/service/gpu_memory_buffer_factory.h" |
#include "ui/gfx/geometry/size.h" |
#include "ui/gfx/gpu_memory_buffer.h" |
@@ -24,11 +24,11 @@ namespace gl { |
class GLImage; |
} |
-namespace content { |
+namespace gpu { |
-class CONTENT_EXPORT GpuMemoryBufferFactorySurfaceTexture |
+class GPU_EXPORT GpuMemoryBufferFactorySurfaceTexture |
: public GpuMemoryBufferFactory, |
- public gpu::ImageFactory { |
+ public ImageFactory { |
public: |
GpuMemoryBufferFactorySurfaceTexture(); |
~GpuMemoryBufferFactorySurfaceTexture() override; |
@@ -40,7 +40,7 @@ class CONTENT_EXPORT GpuMemoryBufferFactorySurfaceTexture |
gfx::BufferFormat format, |
gfx::BufferUsage usage, |
int client_id, |
- gpu::SurfaceHandle surface_handle) override; |
+ SurfaceHandle surface_handle) override; |
gfx::GpuMemoryBufferHandle CreateGpuMemoryBufferFromHandle( |
const gfx::GpuMemoryBufferHandle& handle, |
gfx::GpuMemoryBufferId id, |
@@ -49,9 +49,9 @@ class CONTENT_EXPORT GpuMemoryBufferFactorySurfaceTexture |
int client_id) override; |
void DestroyGpuMemoryBuffer(gfx::GpuMemoryBufferId id, |
int client_id) override; |
- gpu::ImageFactory* AsImageFactory() override; |
+ ImageFactory* AsImageFactory() override; |
- // Overridden from gpu::ImageFactory: |
+ // Overridden from ImageFactory: |
scoped_refptr<gl::GLImage> CreateImageForGpuMemoryBuffer( |
const gfx::GpuMemoryBufferHandle& handle, |
const gfx::Size& size, |
@@ -67,6 +67,6 @@ class CONTENT_EXPORT GpuMemoryBufferFactorySurfaceTexture |
base::Lock surface_textures_lock_; |
}; |
-} // namespace content |
+} // namespace gpu |
-#endif // CONTENT_COMMON_GPU_GPU_MEMORY_BUFFER_FACTORY_SURFACE_TEXTURE_H_ |
+#endif // GPU_IPC_SERVICE_GPU_MEMORY_BUFFER_FACTORY_SURFACE_TEXTURE_H_ |