Mac: Fix janky YouTube animations

Based on experimentation, it appears that calling setNeedsDisplay or
displayIfNeeded on a CAOpenGLLayer which has the isAsynchronous
property set, will result in the animation getting screwed up. In
particular, calls to canDrawInCGLContext stop occurring.

This was working in M35 and M36 because, entirely accidentally, we
were calling setAsynchronous:NO before most instances of
setNeedsDisplay and displayIfNeeded. In r272469, these calls were
removed, and resulting in the janky animation.

Add calls to setAsynchronous:NO before all instances of calling
displayIfNeeded, and almost all instances of calling setNeedsDisplay.

BUG=395827
TEST=manual, automated tests in progress

Review URL: https://codereview.chromium.org/408153002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@284916 0039d316-1c4b-4281-b951-d872f2087c98

content/browser/compositor/browser_compositor_view_private_mac.mm

@@ -147,10 +147,8 @@ void BrowserCompositorViewMacInternal::GotAcceleratedIOSurfaceFrame(
   bool bounds_changed = !CGRectEqualToRect(
       new_layer_bounds, [accelerated_layer_ bounds]);
   [accelerated_layer_ setBounds:new_layer_bounds];
-  if (bounds_changed) {
-    [accelerated_layer_ setNeedsDisplay];
-    [accelerated_layer_ displayIfNeeded];
-  }
+  if (bounds_changed)
+    [accelerated_layer_ setNeedsDisplayAndDisplayAndAck];
 
   // If there was a software layer or an old accelerated layer, remove it.
   // Disable the fade-out animation as the layer is removed.

content/browser/renderer_host/compositing_iosurface_layer_mac.h

@@ -51,10 +51,14 @@ class CompositingIOSurfaceLayerHelper {
   // frame.
   void DidDraw(bool success);
 
+  // Immediately re-draw the layer, even if the content has not changed, and
+  // ensure that the frame be acked.
+  void SetNeedsDisplayAndDisplayAndAck();
+
+  // Immediately draw the layer, only if one is pending, and ensure that the
+  // frame be acked.
+  void DisplayIfNeededAndAck();
  private:
-  // Immediately draw a frame (disregarding vsync) and ensure that the frame is
-  // acknowledged.
-  void ImmediatelyForceDisplayAndAck();
 
   // Called whenever the frame provided in GotNewFrame should be acknowledged
   // (this may be because it was drawn, or it may be to unblock the
@@ -114,6 +118,13 @@ class CompositingIOSurfaceLayerHelper {
 // Called when a new frame is received.
 - (void)gotNewFrame;
 
+// Force a draw immediately (even if this means re-displaying a previously
+// displayed frame).
+- (void)setNeedsDisplayAndDisplayAndAck;
+
+// Force a draw immediately, but only if one was requested.
+- (void)displayIfNeededAndAck;
+
 @end
 
 #endif  // CONTENT_BROWSER_RENDERER_HOST_COMPOSITING_IOSURFACE_LAYER_MAC_H_

content/browser/renderer_host/compositing_iosurface_layer_mac.mm

@@ -54,7 +54,7 @@ void CompositingIOSurfaceLayerHelper::GotNewFrame() {
   // If reqested, draw immediately and don't bother trying to use the
   // isAsynchronous property to ensure smooth animation.
   if (client_->AcceleratedLayerShouldAckImmediately()) {
-    ImmediatelyForceDisplayAndAck();
+    SetNeedsDisplayAndDisplayAndAck();
   } else {
     if (![layer_ isAsynchronous])
       [layer_ setAsynchronous:YES];
@@ -104,8 +104,29 @@ void CompositingIOSurfaceLayerHelper::AckPendingFrame(bool success) {
   TRACE_COUNTER_ID1("browser", "PendingSwapAck", this, 0);
 }
 
-void CompositingIOSurfaceLayerHelper::ImmediatelyForceDisplayAndAck() {
+void CompositingIOSurfaceLayerHelper::SetNeedsDisplayAndDisplayAndAck() {
+  // Drawing using setNeedsDisplay and displayIfNeeded will result in
+  // subsequent canDrawInCGLContext callbacks getting dropped, and jerky
+  // animation. Disable asynchronous drawing before issuing these calls as a
+  // workaround.
+  // http://crbug.com/395827
+  if ([layer_ isAsynchronous])
+    [layer_ setAsynchronous:NO];
+
   [layer_ setNeedsDisplay];
+  DisplayIfNeededAndAck();
+}
+
+void CompositingIOSurfaceLayerHelper::DisplayIfNeededAndAck() {
+  if (!needs_display_)
+    return;
+
+  // As in SetNeedsDisplayAndDisplayAndAck, disable asynchronous drawing before
+  // issuing displayIfNeeded.
+  // http://crbug.com/395827
+  if ([layer_ isAsynchronous])
+    [layer_ setAsynchronous:NO];
+
   [layer_ displayIfNeeded];
 
   // Calls to setNeedsDisplay can sometimes be ignored, especially if issued
@@ -116,7 +137,7 @@ void CompositingIOSurfaceLayerHelper::ImmediatelyForceDisplayAndAck() {
 }
 
 void CompositingIOSurfaceLayerHelper::TimerFired() {
-  ImmediatelyForceDisplayAndAck();
+  SetNeedsDisplayAndDisplayAndAck();
 }
 
 }  // namespace content
@@ -171,6 +192,14 @@ void CompositingIOSurfaceLayerHelper::TimerFired() {
   helper_->GotNewFrame();
 }
 
+- (void)setNeedsDisplayAndDisplayAndAck {
+  helper_->SetNeedsDisplayAndDisplayAndAck();
+}
+
+- (void)displayIfNeededAndAck {
+  helper_->DisplayIfNeededAndAck();
+}
+
 // The remaining methods implement the CAOpenGLLayer interface.
 
 - (CGLPixelFormatObj)copyCGLPixelFormatForDisplayMask:(uint32_t)mask {

content/browser/renderer_host/render_widget_host_view_mac.mm

@@ -1779,8 +1779,8 @@ void RenderWidgetHostViewMac::AcceleratedSurfacePostSubBuffer(
 }
 
 void RenderWidgetHostViewMac::AcceleratedSurfaceSuspend() {
-  if (compositing_iosurface_)
-    compositing_iosurface_->UnrefIOSurface();
+  if (render_widget_host_->is_hidden())
+    DestroyCompositedIOSurfaceAndLayer();
 }
 
 void RenderWidgetHostViewMac::AcceleratedSurfaceRelease() {
@@ -2206,7 +2206,7 @@ void RenderWidgetHostViewMac::PauseForPendingResizeOrRepaintsAndDraw() {
   // to keep the window and the window's contents in sync.
   [cocoa_view_ displayIfNeeded];
   [software_layer_ displayIfNeeded];
-  [compositing_iosurface_layer_ displayIfNeeded];
+  [compositing_iosurface_layer_ displayIfNeededAndAck];
 }
 
 void RenderWidgetHostViewMac::LayoutLayers() {
@@ -2250,8 +2250,7 @@ void RenderWidgetHostViewMac::LayoutLayers() {
       // displayed. Calling displayIfNeeded will ensure that the right size
       // frame is drawn to the screen.
       // http://crbug.com/350817
-      [compositing_iosurface_layer_ setNeedsDisplay];
-      [compositing_iosurface_layer_ displayIfNeeded];
+      [compositing_iosurface_layer_ setNeedsDisplayAndDisplayAndAck];
     }
   }
 }