Index: gpu/ipc/service/image_transport_surface_android.cc |
diff --git a/content/common/gpu/image_transport_surface_android.cc b/gpu/ipc/service/image_transport_surface_android.cc |
similarity index 70% |
rename from content/common/gpu/image_transport_surface_android.cc |
rename to gpu/ipc/service/image_transport_surface_android.cc |
index b8caac131dc625f36e624df18c8e171f05e3f07d..ce1ad8863367bed51313212985779426f78030bb 100644 |
--- a/content/common/gpu/image_transport_surface_android.cc |
+++ b/gpu/ipc/service/image_transport_surface_android.cc |
@@ -2,27 +2,27 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#include "content/common/gpu/image_transport_surface.h" |
+#include "gpu/ipc/service/image_transport_surface.h" |
#include "base/logging.h" |
-#include "content/common/gpu/pass_through_image_transport_surface.h" |
#include "gpu/ipc/common/gpu_surface_lookup.h" |
+#include "gpu/ipc/service/pass_through_image_transport_surface.h" |
#include "ui/gl/gl_surface_egl.h" |
-namespace content { |
+namespace gpu { |
// static |
scoped_refptr<gfx::GLSurface> ImageTransportSurface::CreateNativeSurface( |
GpuChannelManager* manager, |
GpuCommandBufferStub* stub, |
- gpu::SurfaceHandle surface_handle, |
+ SurfaceHandle surface_handle, |
gfx::GLSurface::Format format) { |
- DCHECK(gpu::GpuSurfaceLookup::GetInstance()); |
- DCHECK_NE(surface_handle, gpu::kNullSurfaceHandle); |
+ DCHECK(GpuSurfaceLookup::GetInstance()); |
+ DCHECK_NE(surface_handle, kNullSurfaceHandle); |
// On Android, the surface_handle is the id of the surface in the |
- // GpuSurfaceTracker/gpu::GpuSurfaceLookup |
+ // GpuSurfaceTracker/GpuSurfaceLookup |
ANativeWindow* window = |
- gpu::GpuSurfaceLookup::GetInstance()->AcquireNativeWidget(surface_handle); |
+ GpuSurfaceLookup::GetInstance()->AcquireNativeWidget(surface_handle); |
if (!window) { |
LOG(WARNING) << "Failed to acquire native widget."; |
return nullptr; |
@@ -38,4 +38,4 @@ scoped_refptr<gfx::GLSurface> ImageTransportSurface::CreateNativeSurface( |
new PassThroughImageTransportSurface(manager, stub, surface.get())); |
} |
-} // namespace content |
+} // namespace gpu |