Mac: Towards moving CALayerTree to the browser proc

gpu/ipc/service/image_transport_surface_overlay_mac.mm

 // 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.
 
 #include "gpu/ipc/service/image_transport_surface_overlay_mac.h"
 
 #include <CoreGraphics/CoreGraphics.h>
 #include <IOSurface/IOSurface.h>
 #include <OpenGL/CGLRenderers.h>
 #include <OpenGL/CGLTypes.h>
 #include <OpenGL/gl.h>
 #include <stddef.h>
 
 #include <algorithm>
 
 // This type consistently causes problem on Mac, and needs to be dealt with
 // in a systemic way.
 // http://crbug.com/517208
 #ifndef GL_OES_EGL_image
 typedef void* GLeglImageOES;
 #endif
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/mac/scoped_cftyperef.h"
 #include "base/trace_event/trace_event.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/ca_layer_partial_damage_tree_mac.h"
+#include "ui/accelerated_widget_mac/ca_layer_tree_mac.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"
 #include "ui/gfx/geometry/rect_conversions.h"
 #include "ui/gfx/transform.h"
 #include "ui/gl/gl_context.h"
 #include "ui/gl/gl_fence.h"
 #include "ui/gl/gl_image_io_surface.h"
 #include "ui/gl/gpu_switching_manager.h"
 #include "ui/gl/scoped_api.h"
@@ skipping 233 matching lines @@
     return false;
   }
   if (z_order) {
     DLOG(ERROR) << "Invalid non-zero Z order.";
     return false;
   }
   if (pending_partial_damage_tree_) {
     DLOG(ERROR) << "Only one overlay per swap is allowed.";
     return false;
   }
-  pending_partial_damage_tree_.reset(new CALayerPartialDamageTree(
+  pending_partial_damage_tree_.reset(new ui::CALayerPartialDamageTree(
       use_remote_layer_api_,
       static_cast<gl::GLImageIOSurface*>(image)->io_surface(),
       pixel_frame_rect));
   return true;
 }
 
 bool ImageTransportSurfaceOverlayMac::ScheduleCALayer(
     gl::GLImage* contents_image,
     const gfx::RectF& contents_rect,
     float opacity,
     unsigned background_color,
     unsigned edge_aa_mask,
     const gfx::RectF& rect,
     bool is_clipped,
     const gfx::RectF& clip_rect,
     const gfx::Transform& transform,
     int sorting_context_id,
     unsigned filter) {
   base::ScopedCFTypeRef<IOSurfaceRef> io_surface;
   if (contents_image) {
     io_surface =
         static_cast<gl::GLImageIOSurface*>(contents_image)->io_surface();
   }
   if (!pending_ca_layer_tree_)
-    pending_ca_layer_tree_.reset(new CALayerTree);
+    pending_ca_layer_tree_.reset(new ui::CALayerTree);
   return pending_ca_layer_tree_->ScheduleCALayer(
       is_clipped, gfx::ToEnclosingRect(clip_rect), sorting_context_id,
       transform, io_surface, contents_rect, gfx::ToEnclosingRect(rect),
       background_color, edge_aa_mask, opacity);
 }
 
 bool ImageTransportSurfaceOverlayMac::IsSurfaceless() const {
   return true;
 }
 
@@ skipping 22 matching lines @@
   gl_renderer_id_ = context_renderer_id & kCGLRendererIDMatchingMask;
 
   // Post a task holding a reference to the new GL context. The reason for
   // this is to avoid creating-then-destroying the context for every image
   // transport surface that is observing the GPU switch.
   base::MessageLoop::current()->PostTask(
       FROM_HERE, base::Bind(&IOSurfaceContextNoOp, context_on_new_gpu));
 }
 
 }  // namespace gpu