| Index: gpu/ipc/service/gpu_memory_buffer_factory_surface_texture.cc
|
| diff --git a/content/common/gpu/gpu_memory_buffer_factory_surface_texture.cc b/gpu/ipc/service/gpu_memory_buffer_factory_surface_texture.cc
|
| similarity index 88%
|
| rename from content/common/gpu/gpu_memory_buffer_factory_surface_texture.cc
|
| rename to gpu/ipc/service/gpu_memory_buffer_factory_surface_texture.cc
|
| index eb4b0a3c8dad332cfee69bf37523cf7b0e74594e..1192c9adb045532f7ae747d1e8ff28c2216e33dd 100644
|
| --- a/content/common/gpu/gpu_memory_buffer_factory_surface_texture.cc
|
| +++ b/gpu/ipc/service/gpu_memory_buffer_factory_surface_texture.cc
|
| @@ -2,13 +2,13 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "content/common/gpu/gpu_memory_buffer_factory_surface_texture.h"
|
| +#include "gpu/ipc/service/gpu_memory_buffer_factory_surface_texture.h"
|
|
|
| #include "gpu/ipc/common/android/surface_texture_manager.h"
|
| #include "ui/gl/android/surface_texture.h"
|
| #include "ui/gl/gl_image_surface_texture.h"
|
|
|
| -namespace content {
|
| +namespace gpu {
|
|
|
| GpuMemoryBufferFactorySurfaceTexture::GpuMemoryBufferFactorySurfaceTexture() {
|
| }
|
| @@ -23,7 +23,7 @@ GpuMemoryBufferFactorySurfaceTexture::CreateGpuMemoryBuffer(
|
| gfx::BufferFormat format,
|
| gfx::BufferUsage usage,
|
| int client_id,
|
| - gpu::SurfaceHandle surface_handle) {
|
| + SurfaceHandle surface_handle) {
|
| // Note: this needs to be 0 as the surface texture implemenation will take
|
| // ownership of the texture and call glDeleteTextures when the GPU service
|
| // attaches the surface texture to a real texture id. glDeleteTextures
|
| @@ -34,7 +34,7 @@ GpuMemoryBufferFactorySurfaceTexture::CreateGpuMemoryBuffer(
|
| if (!surface_texture.get())
|
| return gfx::GpuMemoryBufferHandle();
|
|
|
| - gpu::SurfaceTextureManager::GetInstance()->RegisterSurfaceTexture(
|
| + SurfaceTextureManager::GetInstance()->RegisterSurfaceTexture(
|
| id.id, client_id, surface_texture.get());
|
|
|
| {
|
| @@ -73,11 +73,11 @@ void GpuMemoryBufferFactorySurfaceTexture::DestroyGpuMemoryBuffer(
|
| surface_textures_.erase(key);
|
| }
|
|
|
| - gpu::SurfaceTextureManager::GetInstance()->UnregisterSurfaceTexture(
|
| + SurfaceTextureManager::GetInstance()->UnregisterSurfaceTexture(
|
| id.id, client_id);
|
| }
|
|
|
| -gpu::ImageFactory* GpuMemoryBufferFactorySurfaceTexture::AsImageFactory() {
|
| +ImageFactory* GpuMemoryBufferFactorySurfaceTexture::AsImageFactory() {
|
| return this;
|
| }
|
|
|
| @@ -105,4 +105,4 @@ GpuMemoryBufferFactorySurfaceTexture::CreateImageForGpuMemoryBuffer(
|
| return image;
|
| }
|
|
|
| -} // namespace content
|
| +} // namespace gpu
|
|
|