Mac: Towards moving CALayerTree to the browser proc

gpu/ipc/service/image_transport_surface_overlay_mac.h

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef GPU_IPC_SERVICE_IMAGE_TRANSPORT_SURFACE_OVERLAY_MAC_H_
 #define GPU_IPC_SERVICE_IMAGE_TRANSPORT_SURFACE_OVERLAY_MAC_H_
 
 #include <list>
 #include <memory>
 #include <vector>
 
 #import "base/mac/scoped_nsobject.h"
 #include "base/timer/timer.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"
 #include "ui/gl/gpu_switching_observer.h"
 
 @class CAContext;
 @class CALayer;
 
-namespace gpu {
-
+namespace ui {
 class CALayerTree;
 class CALayerPartialDamageTree;
+}
+
+namespace gpu {
 
 class ImageTransportSurfaceOverlayMac : public gfx::GLSurface,
                                         public ui::GpuSwitchingObserver {
  public:
   ImageTransportSurfaceOverlayMac(GpuChannelManager* manager,
                                   GpuCommandBufferStub* stub,
                                   SurfaceHandle handle);
 
   // GLSurface implementation
   bool Initialize(gfx::GLSurface::Format format) override;
@@ skipping 56 matching lines @@
 
   gfx::Size pixel_size_;
   float scale_factor_;
 
   // The renderer ID that all contexts made current to this surface should be
   // targeting.
   GLint gl_renderer_id_;
 
   // Planes that have been scheduled, but have not had a subsequent SwapBuffers
   // call made yet.
-  std::unique_ptr<CALayerPartialDamageTree> pending_partial_damage_tree_;
-  std::unique_ptr<CALayerTree> pending_ca_layer_tree_;
+  std::unique_ptr<ui::CALayerPartialDamageTree> pending_partial_damage_tree_;
+  std::unique_ptr<ui::CALayerTree> pending_ca_layer_tree_;
 
   // The planes that are currently being displayed on the screen.
-  std::unique_ptr<CALayerPartialDamageTree> current_partial_damage_tree_;
-  std::unique_ptr<CALayerTree> current_ca_layer_tree_;
+  std::unique_ptr<ui::CALayerPartialDamageTree> current_partial_damage_tree_;
+  std::unique_ptr<ui::CALayerTree> current_ca_layer_tree_;
 
   // The vsync information provided by the browser.
   bool vsync_parameters_valid_;
   base::TimeTicks vsync_timebase_;
   base::TimeDelta vsync_interval_;
 };
 
 }  // namespace gpu
 
 #endif  // GPU_IPC_SERVICE_IMAGE_TRANSPORT_SURFACE_OVERLAY_MAC_H_