Create an AcceleratedWidgetMac

content/browser/gpu/gpu_process_host_ui_shim.cc

Index: content/browser/gpu/gpu_process_host_ui_shim.cc
diff --git a/content/browser/gpu/gpu_process_host_ui_shim.cc b/content/browser/gpu/gpu_process_host_ui_shim.cc
index 8c4450628e7885b8275398a0659b4d9867022fd5..63caa7b9eb4112813fd4274ab4fbc96973ec0ed0 100644
--- a/content/browser/gpu/gpu_process_host_ui_shim.cc
+++ b/content/browser/gpu/gpu_process_host_ui_shim.cc
@@ -11,6 +11,7 @@
 #include "base/id_map.h"
 #include "base/lazy_instance.h"
 #include "base/strings/string_number_conversions.h"
+#include "content/browser/compositor/gpu_process_transport_factory.h"
 #include "content/browser/gpu/compositor_util.h"
 #include "content/browser/gpu/gpu_data_manager_impl.h"
 #include "content/browser/gpu/gpu_process_host.h"
@@ -40,6 +41,13 @@ namespace {
 #undef DestroyAll
 #endif
 
+#if defined(OS_MACOSX)
+void OnSurfaceDisplayedCallback(int output_surface_id) {
+  content::ImageTransportFactory::GetInstance()->OnSurfaceDisplayed(
+      output_surface_id);
+}
+#endif
+
 base::LazyInstance<IDMap<GpuProcessHostUIShim> > g_hosts_by_id =
     LAZY_INSTANCE_INITIALIZER;
 
@@ -261,13 +269,13 @@ void GpuProcessHostUIShim::OnAcceleratedSurfaceBuffersSwapped(
   DCHECK(IsDelegatedRendererEnabled());
   gfx::AcceleratedWidget native_widget =
       content::GpuSurfaceTracker::Get()->AcquireNativeWidget(params.surface_id);
-  BrowserCompositorCALayerTreeMacGotAcceleratedFrame(
+  AcceleratedWidgetMacGotAcceleratedFrame(
       native_widget,
       params.surface_handle,
-      params.surface_id,
       params.latency_info,
       params.size,
       params.scale_factor,
+      base::Bind(&OnSurfaceDisplayedCallback, params.surface_id),
       &ack_params.disable_throttling,
       &ack_params.renderer_id);
   Send(new AcceleratedSurfaceMsg_BufferPresented(params.route_id, ack_params));