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

ui/accelerated_widget_mac/io_surface_layer.mm

 // Copyright 2013 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/io_surface_layer_mac.h"
+#include "ui/accelerated_widget_mac/io_surface_layer.h"
 
 #include <CoreFoundation/CoreFoundation.h>
 #include <OpenGL/CGLIOSurface.h>
 #include <OpenGL/CGLRenderers.h>
 #include <OpenGL/gl.h>
 #include <OpenGL/OpenGL.h>
 
 #include "base/debug/trace_event.h"
 #include "base/mac/mac_util.h"
 #include "base/mac/sdk_forward_declarations.h"
-#include "content/browser/compositor/io_surface_context_mac.h"
-#include "content/browser/compositor/io_surface_texture_mac.h"
+#include "ui/accelerated_widget_mac/io_surface_context.h"
+#include "ui/accelerated_widget_mac/io_surface_texture.h"
 #include "ui/base/cocoa/animation_utils.h"
-#include "ui/gfx/size_conversions.h"
+#include "ui/gfx/geometry/size_conversions.h"
 #include "ui/gl/gpu_switching_manager.h"
 
 ////////////////////////////////////////////////////////////////////////////////
 // IOSurfaceLayerHelper
 
-namespace content {
+namespace ui {
 
 IOSurfaceLayerHelper::IOSurfaceLayerHelper(
     IOSurfaceLayerClient* client,
     IOSurfaceLayer* layer)
         : client_(client),
           layer_(layer),
           needs_display_(false),
           has_pending_frame_(false),
           did_not_draw_counter_(0),
           is_pumping_frames_(false),
@@ skipping 117 matching lines @@
 
 void IOSurfaceLayerHelper::BeginPumpingFrames() {
   is_pumping_frames_ = true;
 }
 
 void IOSurfaceLayerHelper::EndPumpingFrames() {
   is_pumping_frames_ = false;
   DisplayIfNeededAndAck();
 }
 
-}  // namespace content
+}  // namespace ui
 
 ////////////////////////////////////////////////////////////////////////////////
 // IOSurfaceLayer
 
 @implementation IOSurfaceLayer
 
-- (id)initWithClient:(content::IOSurfaceLayerClient*)client
-     withScaleFactor:(float)scale_factor {
+- (id)initWithClient:(ui::IOSurfaceLayerClient*)client
+            withScaleFactor:(float)scale_factor
+    needsGLFinishWorkaround:(bool)needs_gl_finish_workaround {
   if (self = [super init]) {
-    helper_.reset(new content::IOSurfaceLayerHelper(client, self));
+    helper_.reset(new ui::IOSurfaceLayerHelper(client, self));
 
-    iosurface_ = content::IOSurfaceTexture::Create();
-    context_ = content::IOSurfaceContext::Get(
-        content::IOSurfaceContext::kCALayerContext);
+    iosurface_ = ui::IOSurfaceTexture::Create(needs_gl_finish_workaround);
+    context_ = ui::IOSurfaceContext::Get(
+        ui::IOSurfaceContext::kCALayerContext);
     if (!iosurface_.get() || !context_.get()) {
       LOG(ERROR) << "Failed create CompositingIOSurface or context";
       [self resetClient];
       [self release];
       return nil;
     }
 
     [self setBackgroundColor:CGColorGetConstantColor(kCGColorWhite)];
     [self setAnchorPoint:CGPointMake(0, 0)];
     // Setting contents gravity is necessary to prevent the layer from being
@@ skipping 104 matching lines @@
   if (helper_)
     helper_->DidDraw(draw_succeeded);
 
   [super drawInCGLContext:glContext
               pixelFormat:pixelFormat
              forLayerTime:timeInterval
               displayTime:timeStamp];
 }
 
 @end