Revert of Simplify IOSurface CoreAnimation code: Part 2

content/browser/compositor/browser_compositor_view_private_mac.mm

Index: content/browser/compositor/browser_compositor_view_private_mac.mm
diff --git a/content/browser/compositor/browser_compositor_view_private_mac.mm b/content/browser/compositor/browser_compositor_view_private_mac.mm
index b89c6ee23731badfaacecf98f247303e23ad92ad..913b4b093be83ff8b165874af1f50ad4e3dac7c1 100644
--- a/content/browser/compositor/browser_compositor_view_private_mac.mm
+++ b/content/browser/compositor/browser_compositor_view_private_mac.mm
@@ -208,6 +208,7 @@
   // layer.
   bool needs_new_layer =
       !io_surface_layer_ ||
+      [io_surface_layer_ hasBeenPoisoned] ||
       [io_surface_layer_ scaleFactor] != scale_factor;
   if (needs_new_layer) {
     io_surface_layer_.reset(
@@ -220,12 +221,28 @@
   }
 
   // Open the provided IOSurface.
-  [io_surface_layer_ gotFrameWithIOSurface:io_surface_id
-                             withPixelSize:pixel_size
-                           withScaleFactor:scale_factor];
+  if (io_surface_layer_) {
+    bool result = [io_surface_layer_ gotFrameWithIOSurface:io_surface_id
+                                             withPixelSize:pixel_size
+                                           withScaleFactor:scale_factor];
+    if (!result) {
+      DestroyIOSurfaceLayer(io_surface_layer_);
+      LOG(ERROR) << "Failed open IOSurface in IOSurfaceLayer";
+    }
+  }
+
+  // Give a final complaint if anything with the layer's creation went wrong.
+  // This frame will appear blank, the compositor will try to create another,
+  // and maybe that will go better.
+  if (!io_surface_layer_) {
+    LOG(ERROR) << "IOSurfaceLayer is nil, tab will be blank";
+    IOSurfaceLayerHitError();
+  }
 
   // Make the CALayer draw and set its size appropriately.
   if (io_surface_layer_) {
+    [io_surface_layer_ gotNewFrame];
+
     // Set the bounds of the accelerated layer to match the size of the frame.
     // If the bounds changed, force the content to be displayed immediately.
     CGRect new_layer_bounds = CGRectMake(
@@ -328,8 +345,12 @@
 }
 
 void BrowserCompositorViewMacInternal::IOSurfaceLayerHitError() {
+  // Perform all acks that would have been done if the frame had succeeded, to
+  // un-block the compositor and renderer.
+  IOSurfaceLayerDidDrawFrame();
+
   // Poison the context being used and request a mulligan.
-  DestroyIOSurfaceLayer(io_surface_layer_);
+  [io_surface_layer_ poisonContextAndSharegroup];
   compositor_->ScheduleFullRedraw();
 }