| Index: gpu/ipc/service/image_transport_surface_mac.mm
|
| diff --git a/content/common/gpu/image_transport_surface_mac.mm b/gpu/ipc/service/image_transport_surface_mac.mm
|
| similarity index 88%
|
| rename from content/common/gpu/image_transport_surface_mac.mm
|
| rename to gpu/ipc/service/image_transport_surface_mac.mm
|
| index 9d92bb8c77e84d8474431fc6f22ec98382b9f9ba..56da79fe2fa8c1c36a9493b626e1c62302b08dff 100644
|
| --- a/content/common/gpu/image_transport_surface_mac.mm
|
| +++ b/gpu/ipc/service/image_transport_surface_mac.mm
|
| @@ -2,19 +2,19 @@
|
| // 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/macros.h"
|
| -#include "content/common/gpu/pass_through_image_transport_surface.h"
|
| +#include "gpu/ipc/service/pass_through_image_transport_surface.h"
|
| #include "ui/gfx/native_widget_types.h"
|
| #include "ui/gl/gl_surface_osmesa.h"
|
|
|
| -namespace content {
|
| +namespace gpu {
|
|
|
| scoped_refptr<gfx::GLSurface> ImageTransportSurfaceCreateNativeSurface(
|
| GpuChannelManager* manager,
|
| GpuCommandBufferStub* stub,
|
| - gpu::SurfaceHandle handle);
|
| + SurfaceHandle handle);
|
|
|
| namespace {
|
|
|
| @@ -46,9 +46,9 @@ bool g_allow_os_mesa = false;
|
| scoped_refptr<gfx::GLSurface> ImageTransportSurface::CreateNativeSurface(
|
| GpuChannelManager* manager,
|
| GpuCommandBufferStub* stub,
|
| - gpu::SurfaceHandle surface_handle,
|
| + SurfaceHandle surface_handle,
|
| gfx::GLSurface::Format format) {
|
| - DCHECK_NE(surface_handle, gpu::kNullSurfaceHandle);
|
| + DCHECK_NE(surface_handle, kNullSurfaceHandle);
|
|
|
| switch (gfx::GetGLImplementation()) {
|
| case gfx::kGLImplementationDesktopGL:
|
| @@ -77,4 +77,4 @@ void ImageTransportSurface::SetAllowOSMesaForTesting(bool allow) {
|
| g_allow_os_mesa = allow;
|
| }
|
|
|
| -} // namespace content
|
| +} // namespace gpu
|
|
|