Revert of Simplify IOSurface CoreAnimation code: Part 2

content/browser/compositor/browser_compositor_view_private_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/browser_compositor_view_private_mac.h"
 
 #include <map>
 
 #include "base/debug/trace_event.h"
 #include "base/lazy_instance.h"
@@ skipping 190 matching lines @@
   // In the layer is replaced, keep the old one around until after the new one
   // is installed to avoid flashes.
   base::scoped_nsobject<IOSurfaceLayer> old_io_surface_layer =
       io_surface_layer_;
 
   // Create or re-create an IOSurface layer if needed. If there already exists
   // a layer but it has the wrong scale factor or it was poisoned, re-create the
   // 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(
         [[IOSurfaceLayer alloc] initWithClient:this
                                withScaleFactor:scale_factor]);
     if (io_surface_layer_)
       [flipped_layer_ addSublayer:io_surface_layer_];
     else
       LOG(ERROR) << "Failed to create IOSurfaceLayer";
   }
 
   // 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(
         0, 0, last_swap_size_dip_.width(), last_swap_size_dip_.height());
     bool bounds_changed = !CGRectEqualToRect(
         new_layer_bounds, [io_surface_layer_ bounds]);
     [io_surface_layer_ setBounds:new_layer_bounds];
     if (bounds_changed)
       [io_surface_layer_ setNeedsDisplayAndDisplayAndAck];
   }
@@ skipping 82 matching lines @@
     accelerated_output_surface_id_ = 0;
   }
 
   if (client_)
     client_->BrowserCompositorViewFrameSwapped(accelerated_latency_info_);
 
   accelerated_latency_info_.clear();
 }
 
 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();
 }
 
 // static
 BrowserCompositorViewMacInternal* BrowserCompositorViewMacInternal::
     FromAcceleratedWidget(gfx::AcceleratedWidget widget) {
   WidgetToInternalsMap::const_iterator found =
       g_widget_to_internals_map.Pointer()->find(widget);
   // This can end up being accessed after the underlying widget has been
   // destroyed, but while the ui::Compositor is still being destroyed.
   // Return NULL in these cases.
   if (found == g_widget_to_internals_map.Pointer()->end())
     return NULL;
   return found->second;
 }
 
 }  // namespace content