Move logic from ImageTransportSurfaceOverlayMac into ui/

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 ui {
-class CALayerTree;
-class CALayerPartialDamageTree;
+class CALayerTreeCoordinator;
 }
 
 namespace gpu {
 
 class ImageTransportSurfaceOverlayMac : public gfx::GLSurface,
                                         public ui::GpuSwitchingObserver {
  public:
   ImageTransportSurfaceOverlayMac(GpuChannelManager* manager,
                                   GpuCommandBufferStub* stub,
                                   SurfaceHandle handle);
@@ skipping 48 matching lines @@
       std::vector<ui::LatencyInfo> latency_info);
   gfx::SwapResult SwapBuffersInternal(const gfx::Rect& pixel_damage_rect);
 
   GpuChannelManager* manager_;
   base::WeakPtr<GpuCommandBufferStub> stub_;
   SurfaceHandle handle_;
   std::vector<ui::LatencyInfo> latency_info_;
 
   bool use_remote_layer_api_;
   base::scoped_nsobject<CAContext> ca_context_;
-  base::scoped_nsobject<CALayer> ca_root_layer_;
+  std::unique_ptr<ui::CALayerTreeCoordinator> ca_layer_tree_coordinator_;
 
   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<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<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_