Index: gpu/ipc/service/image_transport_surface_overlay_mac.mm |
diff --git a/content/common/gpu/image_transport_surface_overlay_mac.mm b/gpu/ipc/service/image_transport_surface_overlay_mac.mm |
similarity index 97% |
rename from content/common/gpu/image_transport_surface_overlay_mac.mm |
rename to gpu/ipc/service/image_transport_surface_overlay_mac.mm |
index 0cf26dfee85383a031671350a1461b754183c8b3..4eea4a1bf53962e431654272bad6d0f74c777677 100644 |
--- a/content/common/gpu/image_transport_surface_overlay_mac.mm |
+++ b/gpu/ipc/service/image_transport_surface_overlay_mac.mm |
@@ -2,7 +2,7 @@ |
// 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_overlay_mac.h" |
+#include "gpu/ipc/service/image_transport_surface_overlay_mac.h" |
#include <CoreGraphics/CoreGraphics.h> |
#include <IOSurface/IOSurface.h> |
@@ -24,10 +24,10 @@ typedef void* GLeglImageOES; |
#include "base/bind_helpers.h" |
#include "base/mac/scoped_cftyperef.h" |
#include "base/trace_event/trace_event.h" |
-#include "content/common/gpu/ca_layer_partial_damage_tree_mac.h" |
-#include "content/common/gpu/ca_layer_tree_mac.h" |
-#include "content/common/gpu/gpu_channel_manager.h" |
-#include "content/common/gpu/gpu_channel_manager_delegate.h" |
+#include "gpu/ipc/service/ca_layer_partial_damage_tree_mac.h" |
+#include "gpu/ipc/service/ca_layer_tree_mac.h" |
+#include "gpu/ipc/service/gpu_channel_manager.h" |
+#include "gpu/ipc/service/gpu_channel_manager_delegate.h" |
#include "ui/accelerated_widget_mac/io_surface_context.h" |
#include "ui/base/cocoa/animation_utils.h" |
#include "ui/base/cocoa/remote_layer_api.h" |
@@ -77,12 +77,12 @@ void IOSurfaceContextNoOp(scoped_refptr<ui::IOSurfaceContext>) { |
-(void)setContentsChanged; |
@end |
-namespace content { |
+namespace gpu { |
scoped_refptr<gfx::GLSurface> ImageTransportSurfaceCreateNativeSurface( |
GpuChannelManager* manager, |
GpuCommandBufferStub* stub, |
- gpu::SurfaceHandle handle) { |
+ SurfaceHandle handle) { |
return new ImageTransportSurfaceOverlayMac(manager, stub, handle); |
} |
@@ -116,7 +116,7 @@ class ImageTransportSurfaceOverlayMac::PendingSwap { |
ImageTransportSurfaceOverlayMac::ImageTransportSurfaceOverlayMac( |
GpuChannelManager* manager, |
GpuCommandBufferStub* stub, |
- gpu::SurfaceHandle handle) |
+ SurfaceHandle handle) |
: manager_(manager), |
stub_(stub->AsWeakPtr()), |
handle_(handle), |
@@ -560,4 +560,4 @@ base::TimeTicks ImageTransportSurfaceOverlayMac::GetNextVSyncTimeAfter( |
return previous_vsync + (1 + interval_fraction) * vsync_interval_; |
} |
-} // namespace content |
+} // namespace gpu |