Mac: Always use surfaceless mode

ui/accelerated_widget_mac/accelerated_widget_mac.h

 // 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.
 
 #ifndef UI_ACCELERATED_WIDGET_MAC_ACCELERATED_WIDGET_MAC_H_
 #define UI_ACCELERATED_WIDGET_MAC_ACCELERATED_WIDGET_MAC_H_
 
 #include <IOSurface/IOSurface.h>
 #include <vector>
 
 #include "base/mac/scoped_cftyperef.h"
 #include "ui/accelerated_widget_mac/accelerated_widget_mac_export.h"
+#include "ui/accelerated_widget_mac/surface_handle_types.h"
 #include "ui/events/latency_info.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/gfx/native_widget_types.h"
 
 #if defined(__OBJC__)
 #import <Cocoa/Cocoa.h>
 #import "base/mac/scoped_nsobject.h"
 #include "ui/base/cocoa/remote_layer_api.h"
 #endif  // __OBJC__
@@ skipping 49 matching lines @@
       base::TimeTicks* timebase, base::TimeDelta* interval) const;
 
   // Return true if the renderer should not be throttled by GPU back-pressure.
   bool IsRendererThrottlingDisabled() const;
 
   // Mark a bracket in which new frames are being pumped in a restricted nested
   // run loop.
   void BeginPumpingFrames();
   void EndPumpingFrames();
 
-  void GotAcceleratedFrame(
-      uint64 surface_handle,
-      const std::vector<ui::LatencyInfo>& latency_info,
-      const gfx::Size& pixel_size,
-      float scale_factor,
-      const gfx::Rect& pixel_damage_rect,
-      const base::Closure& drawn_callback);
+  void GotAcceleratedFrame(CAContextID ca_context_id,

[Ken Russell (switch to Gerrit), 2015/10/23 01:13:13]

Could you document that |ca_context_id| and |io_surface| are mutually exclusive
arguments?

+                           base::ScopedCFTypeRef<IOSurfaceRef> io_surface,
+                           const std::vector<ui::LatencyInfo>& latency_info,
+                           const gfx::Size& pixel_size,
+                           float scale_factor,
+                           const gfx::Rect& pixel_damage_rect,
+                           const base::Closure& drawn_callback);
 
   void GotIOSurfaceFrame(base::ScopedCFTypeRef<IOSurfaceRef> io_surface,
                          const gfx::Size& pixel_size,
                          float scale_factor,
                          bool flip_y);
 
  private:
   void GotAcceleratedCAContextFrame(CAContextID ca_context_id,
                                     const gfx::Size& pixel_size,
                                     float scale_factor);
@@ skipping 46 matching lines @@
   // Whether surfaces created by the widget should use the glFinish() workaround
   // after compositing.
   bool needs_gl_finish_workaround_;
 
   DISALLOW_COPY_AND_ASSIGN(AcceleratedWidgetMac);
 };
 
 #endif  // __OBJC__
 
 ACCELERATED_WIDGET_MAC_EXPORT
 void AcceleratedWidgetMacGotAcceleratedFrame(

[ccameron, 2015/10/22 22:16:49]

This has some overlay and redundancy with AcceleratedWidgetGotIOSurfaceFrame.
There is actually quite a bit that can be ripped out here (drawn_callback,
disable_throttling, renderer_id, and flip_y, for starters). I'll have a
follow-up CL that just deletes now-dead code (I tried to keep the functional
changes in this one).

[Ken Russell (switch to Gerrit), 2015/10/23 01:13:13]

Sounds good.

-    gfx::AcceleratedWidget widget, uint64 surface_handle,
+    gfx::AcceleratedWidget widget,
+    CAContextID ca_context_id,
+    base::ScopedCFTypeRef<IOSurfaceRef> io_surface,
     const std::vector<ui::LatencyInfo>& latency_info,
     const gfx::Size& pixel_size,
     float scale_factor,
     const gfx::Rect& pixel_damage_rect,
     const base::Closure& drawn_callback,
-    bool* disable_throttling, int* renderer_id,
-    base::TimeTicks* vsync_timebase, base::TimeDelta* vsync_interval);
+    bool* disable_throttling,
+    int* renderer_id,
+    base::TimeTicks* vsync_timebase,
+    base::TimeDelta* vsync_interval);
 
 ACCELERATED_WIDGET_MAC_EXPORT
 void AcceleratedWidgetMacGotIOSurfaceFrame(
     gfx::AcceleratedWidget widget,
     base::ScopedCFTypeRef<IOSurfaceRef> io_surface,
     const gfx::Size& pixel_size,
     float scale_factor,
     bool flip_y);
 
 }  // namespace ui
 
 #endif  // UI_ACCELERATED_WIDGET_MAC_ACCELERATED_WIDGET_MAC_H_