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

ui/compositor/mac/io_surface_texture_mac.h

 // 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.
 
-#ifndef CONTENT_BROWSER_COMPOSITOR_IO_SURFACE_TEXTURE_MAC_H_
-#define CONTENT_BROWSER_COMPOSITOR_IO_SURFACE_TEXTURE_MAC_H_
+#ifndef UI_COMPOSITOR_MAC_IO_SURFACE_TEXTURE_MAC_H_
+#define UI_COMPOSITOR_MAC_IO_SURFACE_TEXTURE_MAC_H_
 
 #include <deque>
 #include <list>
 #include <vector>
 
 #import <Cocoa/Cocoa.h>
 #include <IOSurface/IOSurfaceAPI.h>
 #include <QuartzCore/QuartzCore.h>
 
 #include "base/callback.h"
 #include "base/lazy_instance.h"
 #include "base/mac/scoped_cftyperef.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time/time.h"
-#include "media/base/video_frame.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/rect_conversions.h"
 #include "ui/gfx/size.h"
 
 class SkBitmap;
 
 namespace gfx {
 class Rect;
 }
 
-namespace content {
+namespace ui {
 
 class IOSurfaceContext;
 class RenderWidgetHostViewFrameSubscriber;
 class RenderWidgetHostViewMac;
 
 // This class manages an OpenGL context and IOSurfaceTexture for the accelerated
 // compositing code path. The GL context is attached to
 // RenderWidgetHostViewCocoa for blitting the IOSurfaceTexture.
 class IOSurfaceTexture
     : public base::RefCounted<IOSurfaceTexture> {
  public:
   // Returns NULL if IOSurfaceTexture or GL API calls fail.
-  static scoped_refptr<IOSurfaceTexture> Create();
+  static scoped_refptr<IOSurfaceTexture> Create(
+      bool needs_gl_finish_workaround);
 
   // Set IOSurfaceTexture that will be drawn on the next NSView drawRect.
   bool SetIOSurface(
       IOSurfaceID io_surface_id,
       const gfx::Size& pixel_size) WARN_UNUSED_RESULT;
 
   // Blit the IOSurface to the rectangle specified by |window_rect| in DIPs,
   // with the origin in the lower left corner. If the window rect's size is
   // larger than the IOSurface, the remaining right and bottom edges will be
   // white. |window_scale_factor| is 1 in normal views, 2 in HiDPI views.
   bool DrawIOSurface() WARN_UNUSED_RESULT;
 
   // Returns true if the offscreen context used by this surface has been
   // poisoned.
   bool HasBeenPoisoned() const;
 
  private:
   friend class base::RefCounted<IOSurfaceTexture>;
 
   IOSurfaceTexture(
-      const scoped_refptr<IOSurfaceContext>& context);
+      const scoped_refptr<IOSurfaceContext>& context,
+      bool needs_gl_finish_workaround);
   ~IOSurfaceTexture();
 
   // Unref the IOSurfaceTexture and delete the associated GL texture. If the GPU
   // process is no longer referencing it, this will delete the IOSurface.
   void ReleaseIOSurfaceAndTexture();
 
   // Check for GL errors and store the result in error_. Only return new
   // errors
   GLenum GetAndSaveGLError();
 
@@ skipping 23 matching lines @@
   // Aggressively evict surfaces when more than 8 (the number allowed by the
   // memory manager for fast tab switching) are allocated.
   enum {
     kMaximumUnevictedSurfaces = 8,
   };
   typedef std::list<IOSurfaceTexture*> EvictionQueue;
   void EvictionMarkUpdated();
   void EvictionMarkEvicted();
   EvictionQueue::iterator eviction_queue_iterator_;
   bool eviction_has_been_drawn_since_updated_;
+  const bool needs_gl_finish_workaround_;
 
   static void EvictionScheduleDoEvict();
   static void EvictionDoEvict();
   static base::LazyInstance<EvictionQueue> eviction_queue_;
   static bool eviction_scheduled_;
 };
 
-}  // namespace content
+}  // namespace ui
 
-#endif  // CONTENT_BROWSER_COMPOSITOR_IO_SURFACE_TEXTURE_MAC_H_
+#endif  // UI_COMPOSITOR_MAC_IO_SURFACE_TEXTURE_MAC_H_