| Index: gpu/ipc/service/image_transport_surface.h
|
| diff --git a/content/common/gpu/image_transport_surface.h b/gpu/ipc/service/image_transport_surface.h
|
| similarity index 77%
|
| rename from content/common/gpu/image_transport_surface.h
|
| rename to gpu/ipc/service/image_transport_surface.h
|
| index 8cb29677e5221cd701c192ccf032e65cabfc08d8..b810babb2ef5c47dfa5ab500188ec434d8cf3f3f 100644
|
| --- a/content/common/gpu/image_transport_surface.h
|
| +++ b/gpu/ipc/service/image_transport_surface.h
|
| @@ -2,19 +2,19 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef CONTENT_COMMON_GPU_IMAGE_TRANSPORT_SURFACE_H_
|
| -#define CONTENT_COMMON_GPU_IMAGE_TRANSPORT_SURFACE_H_
|
| +#ifndef GPU_IPC_SERVICE_IMAGE_TRANSPORT_SURFACE_H_
|
| +#define GPU_IPC_SERVICE_IMAGE_TRANSPORT_SURFACE_H_
|
|
|
| #include <stdint.h>
|
|
|
| #include "base/compiler_specific.h"
|
| #include "base/macros.h"
|
| #include "build/build_config.h"
|
| -#include "content/common/content_export.h"
|
| +#include "gpu/gpu_export.h"
|
| #include "gpu/ipc/common/surface_handle.h"
|
| #include "ui/gl/gl_surface.h"
|
|
|
| -namespace content {
|
| +namespace gpu {
|
| class GpuChannelManager;
|
| class GpuCommandBufferStub;
|
|
|
| @@ -26,7 +26,7 @@ class GpuCommandBufferStub;
|
| class ImageTransportSurface {
|
| public:
|
| #if defined(OS_MACOSX)
|
| - CONTENT_EXPORT static void SetAllowOSMesaForTesting(bool allow);
|
| + GPU_EXPORT static void SetAllowOSMesaForTesting(bool allow);
|
| #endif
|
|
|
| // Creates the appropriate native surface depending on the GL implementation.
|
| @@ -35,13 +35,13 @@ class ImageTransportSurface {
|
| static scoped_refptr<gfx::GLSurface> CreateNativeSurface(
|
| GpuChannelManager* manager,
|
| GpuCommandBufferStub* stub,
|
| - gpu::SurfaceHandle surface_handle,
|
| + SurfaceHandle surface_handle,
|
| gfx::GLSurface::Format format);
|
|
|
| private:
|
| DISALLOW_COPY_AND_ASSIGN(ImageTransportSurface);
|
| };
|
|
|
| -} // namespace content
|
| +} // namespace gpu
|
|
|
| -#endif // CONTENT_COMMON_GPU_IMAGE_TRANSPORT_SURFACE_H_
|
| +#endif // GPU_IPC_SERVICE_IMAGE_TRANSPORT_SURFACE_H_
|
|
|