Mac: Move remote layer use to GpuOutputSurfaceMac

content/browser/compositor/software_output_device_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/software_output_device_mac.h"
 
 #import <Cocoa/Cocoa.h>
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 122 matching lines @@
 
 void SoftwareOutputDeviceMac::EndPaint() {
   SoftwareOutputDevice::EndPaint();
   {
     TRACE_EVENT0("browser", "IOSurfaceUnlock");
     IOReturn io_result = IOSurfaceUnlock(io_surfaces_[current_index_],
                                          kIOSurfaceLockAvoidSync, nullptr);
     if (io_result)
       DLOG(ERROR) << "Failed to unlock IOSurface " << io_result;
   }
+  canvas_.reset();
 
-  canvas_.reset();
-  base::TimeTicks vsync_timebase;
-  base::TimeDelta vsync_interval;
-  ui::AcceleratedWidgetMacGotFrame(
-      compositor_->widget(), 0, false, 0, io_surfaces_[current_index_],
-      pixel_size_, scale_factor_, &vsync_timebase, &vsync_interval);
-  if (!update_vsync_callback_.is_null())
-    update_vsync_callback_.Run(vsync_timebase, vsync_interval);
+  ui::AcceleratedWidgetMac* widget =
+      ui::AcceleratedWidgetMac::Get(compositor_->widget());
+  if (widget) {
+    widget->GotIOSurfaceFrame(io_surfaces_[current_index_], pixel_size_,
+                              scale_factor_);
+    base::TimeTicks vsync_timebase;
+    base::TimeDelta vsync_interval;
+    widget->GetVSyncParameters(&vsync_timebase, &vsync_interval);
+    if (!update_vsync_callback_.is_null())

[tapted, 2016/05/27 00:33:19]

does this need to be outside the if (widget) block to ensure something gets an
ACK?

[ccameron, 2016/06/03 02:43:01]

This is just updating vsync info, so it doesn't need to run every frame (in
practice every few seconds is sufficient).

+      update_vsync_callback_.Run(vsync_timebase, vsync_interval);
+  }
 
   current_index_ = !current_index_;
 }
 
 void SoftwareOutputDeviceMac::DiscardBackbuffer() {
   for (int i = 0; i < 2; ++i)
     io_surfaces_[i].reset();
 }
 
 void SoftwareOutputDeviceMac::EnsureBackbuffer() {}
 
 gfx::VSyncProvider* SoftwareOutputDeviceMac::GetVSyncProvider() {
   return this;
 }
 
 void SoftwareOutputDeviceMac::GetVSyncParameters(
     const gfx::VSyncProvider::UpdateVSyncCallback& callback) {
   update_vsync_callback_ = callback;
 }
 
 }  // namespace content