SurfaceTexture* => gpu/ipc/common

content/common/gpu/client/gpu_memory_buffer_impl_surface_texture.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/common/gpu/client/gpu_memory_buffer_impl_surface_texture.h"
 
 #include "base/logging.h"
 #include "base/trace_event/trace_event.h"
-#include "content/common/android/surface_texture_manager.h"
 #include "content/common/gpu/gpu_memory_buffer_factory_surface_texture.h"
+#include "gpu/ipc/common/android/surface_texture_manager.h"
 #include "ui/gfx/buffer_format_util.h"
 #include "ui/gl/android/surface_texture.h"
 #include "ui/gl/gl_bindings.h"
 
 namespace content {
 namespace {
 
 int WindowFormat(gfx::BufferFormat format) {
   switch (format) {
     case gfx::BufferFormat::RGBA_8888:
@@ skipping 15 matching lines @@
       return 0;
   }
 
   NOTREACHED();
   return 0;
 }
 
 void FreeSurfaceTextureForTesting(
     scoped_refptr<gfx::SurfaceTexture> surface_texture,
     gfx::GpuMemoryBufferId id) {
-  SurfaceTextureManager::GetInstance()->UnregisterSurfaceTexture(id.id, 0);
+  gpu::SurfaceTextureManager::GetInstance()->UnregisterSurfaceTexture(id.id, 0);
 }
 
 }  // namespace
 
 GpuMemoryBufferImplSurfaceTexture::GpuMemoryBufferImplSurfaceTexture(
     gfx::GpuMemoryBufferId id,
     const gfx::Size& size,
     gfx::BufferFormat format,
     const DestructionCallback& callback,
     ANativeWindow* native_window)
     : GpuMemoryBufferImpl(id, size, format, callback),
       native_window_(native_window) {}
 
 GpuMemoryBufferImplSurfaceTexture::~GpuMemoryBufferImplSurfaceTexture() {
   ANativeWindow_release(native_window_);
 }
 
 // static
 scoped_ptr<GpuMemoryBufferImplSurfaceTexture>
 GpuMemoryBufferImplSurfaceTexture::CreateFromHandle(
     const gfx::GpuMemoryBufferHandle& handle,
     const gfx::Size& size,
     gfx::BufferFormat format,
     gfx::BufferUsage usage,
     const DestructionCallback& callback) {
   ANativeWindow* native_window =
-      SurfaceTextureManager::GetInstance()
+      gpu::SurfaceTextureManager::GetInstance()
           ->AcquireNativeWidgetForSurfaceTexture(handle.id.id);
   if (!native_window)
     return nullptr;
 
   ANativeWindow_setBuffersGeometry(
       native_window, size.width(), size.height(), WindowFormat(format));
 
   return make_scoped_ptr(new GpuMemoryBufferImplSurfaceTexture(
       handle.id, size, format, callback, native_window));
 }
 
 // static
 bool GpuMemoryBufferImplSurfaceTexture::IsConfigurationSupported(
     gfx::BufferFormat format,
     gfx::BufferUsage usage) {
   return GpuMemoryBufferFactorySurfaceTexture::
       IsGpuMemoryBufferConfigurationSupported(format, usage);
 }
 
 // static
 base::Closure GpuMemoryBufferImplSurfaceTexture::AllocateForTesting(
     const gfx::Size& size,
     gfx::BufferFormat format,
     gfx::BufferUsage usage,
     gfx::GpuMemoryBufferHandle* handle) {
   scoped_refptr<gfx::SurfaceTexture> surface_texture =
       gfx::SurfaceTexture::Create(0);
   DCHECK(surface_texture);
   const gfx::GpuMemoryBufferId kBufferId(1);
-  SurfaceTextureManager::GetInstance()->RegisterSurfaceTexture(
+  gpu::SurfaceTextureManager::GetInstance()->RegisterSurfaceTexture(
       kBufferId.id, 0, surface_texture.get());
   handle->type = gfx::SURFACE_TEXTURE_BUFFER;
   handle->id = kBufferId;
   return base::Bind(&FreeSurfaceTextureForTesting, surface_texture, kBufferId);
 }
 
 bool GpuMemoryBufferImplSurfaceTexture::Map() {
   TRACE_EVENT0("gpu", "GpuMemoryBufferImplSurfaceTexture::Map");
   DCHECK(!mapped_);
   DCHECK(native_window_);
@@ skipping 28 matching lines @@
 
 gfx::GpuMemoryBufferHandle
 GpuMemoryBufferImplSurfaceTexture::GetHandle() const {
   gfx::GpuMemoryBufferHandle handle;
   handle.type = gfx::SURFACE_TEXTURE_BUFFER;
   handle.id = id_;
   return handle;
 }
 
 }  // namespace content