MacViews: Move content::AcceleratedWidget to new component, ui/accelerated_widget_mac

ui/compositor/mac/accelerated_widget_mac.mm

 // Copyright 2014 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 "content/browser/compositor/browser_compositor_ca_layer_tree_mac.h"
+#include "ui/compositor/mac/accelerated_widget_mac.h"
 
 #include <map>
 
-#include "cc/output/software_frame_data.h"
 #include "base/debug/trace_event.h"
 #include "base/lazy_instance.h"
 #include "base/message_loop/message_loop.h"
-#include "content/browser/compositor/io_surface_layer_mac.h"
-#include "content/browser/compositor/software_layer_mac.h"
-#include "content/common/gpu/surface_handle_types_mac.h"
-#include "content/public/browser/context_factory.h"
+#include "cc/output/software_frame_data.h"
+#include "third_party/skia/include/core/SkCanvas.h"
 #include "ui/base/cocoa/animation_utils.h"
+#include "ui/compositor/mac/io_surface_layer_mac.h"
+#include "ui/compositor/mac/surface_handle_types_mac.h"
 #include "ui/gfx/geometry/dip_util.h"
 #include "ui/gl/scoped_cgl.h"
 
-namespace content {
+namespace ui {
 namespace {
 
 typedef std::map<gfx::AcceleratedWidget,AcceleratedWidgetMac*>
     WidgetToHelperMap;
 base::LazyInstance<WidgetToHelperMap> g_widget_to_helper_map;
 
 AcceleratedWidgetMac* GetHelperFromAcceleratedWidget(
     gfx::AcceleratedWidget widget) {
   WidgetToHelperMap::const_iterator found =
       g_widget_to_helper_map.Pointer()->find(widget);
   // This can end up being accessed after the underlying widget has been
   // destroyed, but while the ui::Compositor is still being destroyed.
   // Return NULL in these cases.
   if (found == g_widget_to_helper_map.Pointer()->end())
     return NULL;
   return found->second;
 }
 
-}
+}  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // AcceleratedWidgetMac
 
-AcceleratedWidgetMac::AcceleratedWidgetMac()
-    : view_(NULL) {
+AcceleratedWidgetMac::AcceleratedWidgetMac(bool needs_gl_finish_workaround)
+    : view_(NULL),
+      needs_gl_finish_workaround_(needs_gl_finish_workaround) {
   // Disable the fade-in animation as the layers are added.
   ScopedCAActionDisabler disabler;
 
   // Add a flipped transparent layer as a child, so that we don't need to
   // fiddle with the position of sub-layers -- they will always be at the
   // origin.
   flipped_layer_.reset([[CALayer alloc] init]);
   [flipped_layer_ setGeometryFlipped:YES];
   [flipped_layer_ setAnchorPoint:CGPointMake(0, 0)];
   [flipped_layer_
@@ skipping 151 matching lines @@
   // Create or re-create an IOSurface layer if needed. If there already exists
   // a layer but it has the wrong scale factor or it was poisoned, re-create the
   // layer.
   bool needs_new_layer =
       !io_surface_layer_ ||
       [io_surface_layer_ hasBeenPoisoned] ||
       [io_surface_layer_ scaleFactor] != scale_factor;
   if (needs_new_layer) {
     io_surface_layer_.reset(
         [[IOSurfaceLayer alloc] initWithClient:this
-                               withScaleFactor:scale_factor]);
+                               withScaleFactor:scale_factor
+                       needsGLFinishWorkaround:needs_gl_finish_workaround_]);
     if (io_surface_layer_)
       [flipped_layer_ addSublayer:io_surface_layer_];
     else
       LOG(ERROR) << "Failed to create IOSurfaceLayer";
   }
 
   // Open the provided IOSurface.
   if (io_surface_layer_) {
     bool result = [io_surface_layer_ gotFrameWithIOSurface:io_surface_id
                                              withPixelSize:pixel_size
@@ skipping 31 matching lines @@
   // in the hierarchy.
   if (old_io_surface_layer != io_surface_layer_)
     DestroyIOSurfaceLayer(old_io_surface_layer);
 
   // Remove any different-type layers that this is replacing.
   DestroyCAContextLayer(ca_context_layer_);
   DestroySoftwareLayer();
 }
 
 void AcceleratedWidgetMac::GotSoftwareFrame(
     cc::SoftwareFrameData* frame_data,

[piman, 2014/11/26 20:58:08]

It doesn't look like frame_data is used at all (except to check for NULL). Can
we remove it?

[tapted, 2014/11/27 02:50:34]

Done. (InProcess doesn't need it either, I even had it just making a dummy
object to pass in).

     float scale_factor,
     SkCanvas* canvas) {
   if (!frame_data || !canvas || !view_)
     return;
 
   // Disable the fade-in or fade-out effect if we create or remove layers.
   ScopedCAActionDisabler disabler;
 
   // If there is not a layer for software frames, create one.
   if (!software_layer_) {
@@ skipping 99 matching lines @@
 
 void AcceleratedWidgetMacGotSoftwareFrame(
     gfx::AcceleratedWidget widget,
     cc::SoftwareFrameData* frame_data, float scale_factor, SkCanvas* canvas) {
   AcceleratedWidgetMac* accelerated_widget_mac =
       GetHelperFromAcceleratedWidget(widget);
   if (accelerated_widget_mac)
     accelerated_widget_mac->GotSoftwareFrame(frame_data, scale_factor, canvas);
 }
 
-}  // namespace content
+}  // namespace ui