PresentationCallback: trun on it for Mac

Bug: 776877
Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:mac_optional_gpu_tests_rel;luci.chromium.try:win_optional_gpu_tests_rel
Change-Id: I0c1e2c3be1569cc89385e210d9fabfa1ecda6a84
Reviewed-on: https://chromium-review.googlesource.com/1054336Reviewed-by: Antoine Labour <piman@chromium.org>
Commit-Queue: Peng Huang <penghuang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#558756}

gpu/ipc/service/image_transport_surface_mac.mm

@@ -5,6 +5,7 @@
 #include "gpu/ipc/service/image_transport_surface.h"
 
 #include "base/macros.h"
+#include "base/threading/thread_task_runner_handle.h"
 #include "gpu/ipc/service/image_transport_surface_overlay_mac.h"
 #include "gpu/ipc/service/pass_through_image_transport_surface.h"
 #include "ui/gfx/native_widget_types.h"
@@ -27,6 +28,7 @@ class DRTSurfaceOSMesa : public gl::GLSurfaceOSMesa {
 
   // Implement a subset of GLSurface.
   gfx::SwapResult SwapBuffers(const PresentationCallback& callback) override;
+  bool SupportsPresentationCallback() override;
 
  private:
   ~DRTSurfaceOSMesa() override {}
@@ -35,9 +37,17 @@ class DRTSurfaceOSMesa : public gl::GLSurfaceOSMesa {
 
 gfx::SwapResult DRTSurfaceOSMesa::SwapBuffers(
     const PresentationCallback& callback) {
+  gfx::PresentationFeedback feedback(base::TimeTicks::Now(), base::TimeDelta(),
+                                     0 /* flags */);
+  base::ThreadTaskRunnerHandle::Get()->PostTask(
+      FROM_HERE, base::BindOnce(callback, std::move(feedback)));
   return gfx::SwapResult::SWAP_ACK;
 }
 
+bool DRTSurfaceOSMesa::SupportsPresentationCallback() {
+  return true;
+}
+
 bool g_allow_os_mesa = false;
 
 }  //  namespace

gpu/ipc/service/image_transport_surface_overlay_mac.h

@@ -64,6 +64,7 @@ class ImageTransportSurfaceOverlayMac : public gl::GLSurface,
   void ScheduleCALayerInUseQuery(
       std::vector<CALayerInUseQuery> queries) override;
   bool IsSurfaceless() const override;
+  bool SupportsPresentationCallback() override;
 
   // ui::GpuSwitchingObserver implementation.
   void OnGpuSwitched() override;
@@ -74,7 +75,8 @@ class ImageTransportSurfaceOverlayMac : public gl::GLSurface,
   void SetSnapshotRequested();
   bool GetAndResetSnapshotRequested();
 
-  gfx::SwapResult SwapBuffersInternal(const gfx::Rect& pixel_damage_rect);
+  gfx::SwapResult SwapBuffersInternal(const gfx::Rect& pixel_damage_rect,
+                                      const PresentationCallback& callback);
   void ApplyBackpressure(base::TimeTicks* before_flush_time,
                          base::TimeTicks* after_flush_before_commit_time);
 

gpu/ipc/service/image_transport_surface_overlay_mac.mm

@@ -183,7 +183,8 @@ void ImageTransportSurfaceOverlayMac::ApplyBackpressure(
 }
 
 gfx::SwapResult ImageTransportSurfaceOverlayMac::SwapBuffersInternal(
-    const gfx::Rect& pixel_damage_rect) {
+    const gfx::Rect& pixel_damage_rect,
+    const PresentationCallback& callback) {
   TRACE_EVENT0("gpu", "ImageTransportSurfaceOverlayMac::SwapBuffersInternal");
 
   // Do a GL fence for flush to apply back-pressure before drawing.
@@ -242,16 +243,21 @@ gfx::SwapResult ImageTransportSurfaceOverlayMac::SwapBuffersInternal(
 
   // Send the swap parameters to the browser.
   delegate_->DidSwapBuffersComplete(std::move(params));
-
+  constexpr int64_t kRefreshIntervalInMicroseconds =
+      base::Time::kMicrosecondsPerSecond / 60;
+  gfx::PresentationFeedback feedback(
+      base::TimeTicks::Now(),
+      base::TimeDelta::FromMicroseconds(kRefreshIntervalInMicroseconds),
+      0 /* flags */);
+  base::ThreadTaskRunnerHandle::Get()->PostTask(
+      FROM_HERE, base::BindOnce(callback, std::move(feedback)));
   return gfx::SwapResult::SWAP_ACK;
 }
 
 gfx::SwapResult ImageTransportSurfaceOverlayMac::SwapBuffers(
     const PresentationCallback& callback) {
-  // TODO(penghuang): Provide useful presentation feedback.
-  // https://crbug.com/776877
   return SwapBuffersInternal(
-      gfx::Rect(0, 0, pixel_size_.width(), pixel_size_.height()));
+      gfx::Rect(0, 0, pixel_size_.width(), pixel_size_.height()), callback);
 }
 
 gfx::SwapResult ImageTransportSurfaceOverlayMac::PostSubBuffer(
@@ -260,9 +266,7 @@ gfx::SwapResult ImageTransportSurfaceOverlayMac::PostSubBuffer(
     int width,
     int height,
     const PresentationCallback& callback) {
-  // TODO(penghuang): Provide useful presentation feedback.
-  // https://crbug.com/776877
-  return SwapBuffersInternal(gfx::Rect(x, y, width, height));
+  return SwapBuffersInternal(gfx::Rect(x, y, width, height), callback);
 }
 
 bool ImageTransportSurfaceOverlayMac::SupportsPostSubBuffer() {
@@ -348,6 +352,10 @@ bool ImageTransportSurfaceOverlayMac::IsSurfaceless() const {
   return true;
 }
 
+bool ImageTransportSurfaceOverlayMac::SupportsPresentationCallback() {
+  return true;
+}
+
 bool ImageTransportSurfaceOverlayMac::Resize(const gfx::Size& pixel_size,
                                              float scale_factor,
                                              ColorSpace color_space,

ui/gl/gl_surface_stub.cc

@@ -4,6 +4,7 @@
 
 #include "ui/gl/gl_surface_stub.h"
 
+#include "base/threading/thread_task_runner_handle.h"
 #include "base/time/time.h"
 
 namespace gl {
@@ -24,8 +25,10 @@ bool GLSurfaceStub::IsOffscreen() {
 
 gfx::SwapResult GLSurfaceStub::SwapBuffers(
     const PresentationCallback& callback) {
-  callback.Run(gfx::PresentationFeedback(base::TimeTicks::Now(),
-                                         base::TimeDelta(), 0 /* flags */));
+  gfx::PresentationFeedback feedback(base::TimeTicks::Now(), base::TimeDelta(),
+                                     0 /* flags */);
+  base::ThreadTaskRunnerHandle::Get()->PostTask(
+      FROM_HERE, base::BindOnce(callback, std::move(feedback)));
   return gfx::SwapResult::SWAP_ACK;
 }
 

ui/gl/gl_switches_util.cc

@@ -14,7 +14,7 @@ namespace gl {
 bool IsPresentationCallbackEnabled() {
 // TODO(peng): always enable once 776877 is fixed.
 #if defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_LINUX) || \
-    defined(OS_WIN)
+    defined(OS_WIN) || defined(OS_MACOSX)
   return true;
 #else
   return base::CommandLine::ForCurrentProcess()->HasSwitch(