Index: gpu/ipc/service/image_transport_surface_overlay_mac.h |
diff --git a/content/common/gpu/image_transport_surface_overlay_mac.h b/gpu/ipc/service/image_transport_surface_overlay_mac.h |
similarity index 92% |
rename from content/common/gpu/image_transport_surface_overlay_mac.h |
rename to gpu/ipc/service/image_transport_surface_overlay_mac.h |
index 84527798958cd921083ef4aceaca5c2ec5ee1a63..dde6109abaf8d5fc9f6081496802da90fc62354a 100644 |
--- a/content/common/gpu/image_transport_surface_overlay_mac.h |
+++ b/gpu/ipc/service/image_transport_surface_overlay_mac.h |
@@ -2,16 +2,16 @@ |
// 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_OVERLAY_MAC_H_ |
-#define CONTENT_COMMON_GPU_IMAGE_TRANSPORT_SURFACE_OVERLAY_MAC_H_ |
+#ifndef GPU_IPC_SERVICE_IMAGE_TRANSPORT_SURFACE_OVERLAY_MAC_H_ |
+#define GPU_IPC_SERVICE_IMAGE_TRANSPORT_SURFACE_OVERLAY_MAC_H_ |
#include <list> |
#include <vector> |
#import "base/mac/scoped_nsobject.h" |
#include "base/timer/timer.h" |
-#include "content/common/gpu/gpu_command_buffer_stub.h" |
-#include "content/common/gpu/image_transport_surface.h" |
+#include "gpu/ipc/service/gpu_command_buffer_stub.h" |
+#include "gpu/ipc/service/image_transport_surface.h" |
#include "ui/base/cocoa/remote_layer_api.h" |
#include "ui/events/latency_info.h" |
#include "ui/gl/gl_surface.h" |
@@ -20,7 +20,7 @@ |
@class CAContext; |
@class CALayer; |
-namespace content { |
+namespace gpu { |
class CALayerTree; |
class CALayerPartialDamageTree; |
@@ -30,7 +30,7 @@ class ImageTransportSurfaceOverlayMac : public gfx::GLSurface, |
public: |
ImageTransportSurfaceOverlayMac(GpuChannelManager* manager, |
GpuCommandBufferStub* stub, |
- gpu::SurfaceHandle handle); |
+ SurfaceHandle handle); |
// GLSurface implementation |
bool Initialize(gfx::GLSurface::Format format) override; |
@@ -112,7 +112,7 @@ class ImageTransportSurfaceOverlayMac : public gfx::GLSurface, |
GpuChannelManager* manager_; |
base::WeakPtr<GpuCommandBufferStub> stub_; |
- gpu::SurfaceHandle handle_; |
+ SurfaceHandle handle_; |
std::vector<ui::LatencyInfo> latency_info_; |
bool use_remote_layer_api_; |
@@ -153,6 +153,6 @@ class ImageTransportSurfaceOverlayMac : public gfx::GLSurface, |
base::WeakPtrFactory<ImageTransportSurfaceOverlayMac> weak_factory_; |
}; |
-} // namespace content |
+} // namespace gpu |
-#endif // CONTENT_COMMON_GPU_IMAGE_TRANSPORT_SURFACE_OVERLAY_MAC_H_ |
+#endif // GPU_IPC_SERVICE_IMAGE_TRANSPORT_SURFACE_OVERLAY_MAC_H_ |