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

ui/accelerated_widget_mac/io_surface_texture.mm

 // Copyright (c) 2012 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_texture_mac.h"
+#include "ui/accelerated_widget_mac/io_surface_texture.h"
 
 #include <OpenGL/CGLIOSurface.h>
 #include <OpenGL/CGLRenderers.h>
+#include <OpenGL/gl.h>
 #include <OpenGL/OpenGL.h>
-#include <OpenGL/gl.h>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback_helpers.h"
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
 #include "base/mac/bind_objc_block.h"
 #include "base/mac/mac_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/threading/platform_thread.h"
-#include "content/browser/compositor/io_surface_context_mac.h"
-#include "content/browser/gpu/gpu_data_manager_impl.h"
-#include "content/browser/renderer_host/render_widget_host_impl.h"
-#include "content/browser/renderer_host/render_widget_host_view_mac.h"
-#include "content/common/content_constants_internal.h"
-#include "gpu/config/gpu_driver_bug_workaround_type.h"
-#include "media/base/video_util.h"
 #include "third_party/skia/include/core/SkBitmap.h"
-#include "ui/gfx/rect.h"
-#include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h"
-#include "ui/gfx/size_conversions.h"
+#include "ui/accelerated_widget_mac/io_surface_context.h"
+#include "ui/gfx/geometry/rect.h"
+#include "ui/gfx/geometry/size_conversions.h"
 #include "ui/gl/gl_context.h"
 
-namespace content {
+namespace ui {
 
 // static
-scoped_refptr<IOSurfaceTexture> IOSurfaceTexture::Create() {
+scoped_refptr<IOSurfaceTexture> IOSurfaceTexture::Create(
+    bool needs_gl_finish_workaround) {
   scoped_refptr<IOSurfaceContext> offscreen_context =
       IOSurfaceContext::Get(
           IOSurfaceContext::kOffscreenContext);
   if (!offscreen_context.get()) {
     LOG(ERROR) << "Failed to create context for offscreen operations";
     return NULL;
   }
 
-  return new IOSurfaceTexture(offscreen_context);
+  return new IOSurfaceTexture(offscreen_context, needs_gl_finish_workaround);
 }
 
 IOSurfaceTexture::IOSurfaceTexture(
-    const scoped_refptr<IOSurfaceContext>& offscreen_context)
+    const scoped_refptr<IOSurfaceContext>& offscreen_context,
+    bool needs_gl_finish_workaround)
     : offscreen_context_(offscreen_context),
       texture_(0),
       gl_error_(GL_NO_ERROR),
       eviction_queue_iterator_(eviction_queue_.Get().end()),
-      eviction_has_been_drawn_since_updated_(false) {
+      eviction_has_been_drawn_since_updated_(false),
+      needs_gl_finish_workaround_(needs_gl_finish_workaround) {
   CHECK(offscreen_context_.get());
 }
 
 IOSurfaceTexture::~IOSurfaceTexture() {
   ReleaseIOSurfaceAndTexture();
   offscreen_context_ = NULL;
   DCHECK(eviction_queue_iterator_ == eviction_queue_.Get().end());
 }
 
 bool IOSurfaceTexture::DrawIOSurface() {
@@ skipping 37 matching lines @@
   glEnd();
   glBindTexture(GL_TEXTURE_RECTANGLE_ARB, 0);
   glDisable(GL_TEXTURE_RECTANGLE_ARB);
 
   // Workaround for issue 158469. Issue a dummy draw call with texture_ not
   // bound to a texture, in order to shake all references to the IOSurface out
   // of the driver.
   glBegin(GL_TRIANGLES);
   glEnd();
 
-  bool workaround_needed =
-      GpuDataManagerImpl::GetInstance()->IsDriverBugWorkaroundActive(
-          gpu::FORCE_GL_FINISH_AFTER_COMPOSITING);
-  if (workaround_needed) {
+  if (needs_gl_finish_workaround_) {
     TRACE_EVENT0("gpu", "glFinish");
     glFinish();
   }
 
   // Check if any of the drawing calls result in an error.
   GetAndSaveGLError();
   bool result = true;
   if (gl_error_ != GL_NO_ERROR) {
     LOG(ERROR) << "GL error in DrawIOSurface: " << gl_error_;
     result = false;
@@ skipping 160 matching lines @@
   }
 }
 
 // static
 base::LazyInstance<IOSurfaceTexture::EvictionQueue>
     IOSurfaceTexture::eviction_queue_;
 
 // static
 bool IOSurfaceTexture::eviction_scheduled_ = false;
 
-}  // namespace content
+}  // namespace ui