Fix crash in GotAcceleratedIOSurfaceFrame

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 114 matching lines @@
     const std::vector<ui::LatencyInfo>& latency_info,
     gfx::Size pixel_size, float scale_factor) {
   // Record the surface and latency info to use when acknowledging this frame.
   DCHECK(!accelerated_output_surface_id_);
   accelerated_output_surface_id_ = output_surface_id;
   accelerated_latency_info_.insert(accelerated_latency_info_.end(),
                                    latency_info.begin(), latency_info.end());
 
   // If there is no client and therefore no superview to draw into, early-out.
   if (!client_) {
-    AcceleratedLayerDidDrawFrame(true);
+    AcceleratedLayerDidDrawFrame();
     return;
   }
 
   // Disable the fade-in or fade-out effect if we create or remove layers.
   ScopedCAActionDisabler disabler;
 
   last_swap_size_dip_ = ConvertSizeToDIP(scale_factor, pixel_size);
   switch (GetSurfaceHandleType(surface_handle)) {
     case kSurfaceHandleTypeIOSurface: {
       IOSurfaceID io_surface_id = IOSurfaceIDFromSurfaceHandle(surface_handle);
@@ skipping 25 matching lines @@
   if ([ca_context_layer_ contextId] != ca_context_id) {
     ca_context_layer_.reset([[CALayerHost alloc] init]);
     [ca_context_layer_ setContextId:ca_context_id];
     [ca_context_layer_
         setAutoresizingMask:kCALayerMaxXMargin|kCALayerMaxYMargin];
     [flipped_layer_ addSublayer:ca_context_layer_];
   }
 
   // Acknowledge the frame to unblock the compositor immediately (the GPU
   // process will do any required throttling).
-  AcceleratedLayerDidDrawFrame(true);
+  AcceleratedLayerDidDrawFrame();
 
   // If this replacing a same-type layer, remove it now that the new layer is
   // in the hierarchy.
   if (old_ca_context_layer != ca_context_layer_)
-    [old_ca_context_layer removeFromSuperlayer];
+    DestroyCAContextLayer(old_ca_context_layer);
 
   // Remove any different-type layers that this is replacing.
-  if (io_surface_layer_) {
-    [io_surface_layer_ resetClient];
-    [io_surface_layer_ removeFromSuperlayer];
-    io_surface_layer_.reset();
-  }
-  if (software_layer_) {
-    [software_layer_ removeFromSuperlayer];
-    software_layer_.reset();
-  }
+  DestroyIOSurfaceLayer(io_surface_layer_);
+  DestroySoftwareLayer();
 }
 
 void BrowserCompositorViewMacInternal::GotAcceleratedIOSurfaceFrame(
     IOSurfaceID io_surface_id,
     gfx::Size pixel_size,
     float scale_factor) {
   // In the layer is replaced, keep the old one around until after the new one
   // is installed to avoid flashes.
   base::scoped_nsobject<CompositingIOSurfaceLayer> 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_ context]->HasBeenPoisoned() ||
       [io_surface_layer_ iosurface]->scale_factor() != scale_factor;
   if (needs_new_layer) {
     scoped_refptr<content::CompositingIOSurfaceMac> iosurface =
         content::CompositingIOSurfaceMac::Create();
-    io_surface_layer_.reset([[CompositingIOSurfaceLayer alloc]
-        initWithIOSurface:iosurface
-          withScaleFactor:scale_factor
-               withClient:this]);
-    [flipped_layer_ addSublayer:io_surface_layer_];
+    if (!iosurface) {
+      LOG(ERROR) << "Failed to create CompositingIOSurfaceMac";
+    } else {
+      io_surface_layer_.reset([[CompositingIOSurfaceLayer alloc]
+          initWithIOSurface:iosurface
+            withScaleFactor:scale_factor
+                 withClient:this]);
+      if (io_surface_layer_)
+        [flipped_layer_ addSublayer:io_surface_layer_];
+      else
+        LOG(ERROR) << "Failed to create CompositingIOSurfaceLayer";
+    }
   }
 
   // Open the provided IOSurface.
-  {
+  if (io_surface_layer_) {
     bool result = true;
     gfx::ScopedCGLSetCurrentContext scoped_set_current_context(
         [io_surface_layer_ context]->cgl_context());
     result = [io_surface_layer_ iosurface]->SetIOSurfaceWithContextCurrent(
         [io_surface_layer_ context], io_surface_id, pixel_size, scale_factor);
-    if (!result)
-      LOG(ERROR) << "Failed SetIOSurface on CompositingIOSurfaceMac";
+    if (!result) {
+      DestroyIOSurfaceLayer(io_surface_layer_);
+      LOG(ERROR) << "Failed open IOSurface in CompositingIOSurfaceLayer";
+    }
   }
-  [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];
+  // 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) << "CompositingIOSurfaceLayer is nil, tab will be blank";
+    AcceleratedLayerHitError();
+  }
+
+  // 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];
+  }
 
   // If this replacing a same-type layer, remove it now that the new layer is
   // in the hierarchy.
-  if (old_io_surface_layer != io_surface_layer_) {
-    [old_io_surface_layer resetClient];
-    [old_io_surface_layer removeFromSuperlayer];
-  }
+  if (old_io_surface_layer != io_surface_layer_)
+    DestroyIOSurfaceLayer(old_io_surface_layer);
 
   // Remove any different-type layers that this is replacing.
-  if (ca_context_layer_) {
-    [ca_context_layer_ removeFromSuperlayer];
-    ca_context_layer_.reset();
-  }
-  if (software_layer_) {
-    [software_layer_ removeFromSuperlayer];
-    software_layer_.reset();
-  }
+  DestroyCAContextLayer(ca_context_layer_);
+  DestroySoftwareLayer();
 }
 
 void BrowserCompositorViewMacInternal::GotSoftwareFrame(
     cc::SoftwareFrameData* frame_data,
     float scale_factor,
     SkCanvas* canvas) {
   if (!frame_data || !canvas || !client_)
     return;
 
   // Disable the fade-in or fade-out effect if we create or remove layers.
@@ skipping 10 matching lines @@
   size_t row_bytes;
   const void* pixels = canvas->peekPixels(&info, &row_bytes);
   gfx::Size pixel_size(info.fWidth, info.fHeight);
   [software_layer_ setContentsToData:pixels
                         withRowBytes:row_bytes
                        withPixelSize:pixel_size
                      withScaleFactor:scale_factor];
   last_swap_size_dip_ = ConvertSizeToDIP(scale_factor, pixel_size);
 
   // Remove any different-type layers that this is replacing.
-  if (ca_context_layer_) {
-    [ca_context_layer_ removeFromSuperlayer];
+  DestroyCAContextLayer(ca_context_layer_);
+  DestroyIOSurfaceLayer(io_surface_layer_);
+}
+
+void BrowserCompositorViewMacInternal::DestroyCAContextLayer(
+    base::scoped_nsobject<CALayerHost> ca_context_layer) {
+  if (!ca_context_layer)
+    return;
+  [ca_context_layer removeFromSuperlayer];
+  if (ca_context_layer == ca_context_layer_)
     ca_context_layer_.reset();
-  }
-  if (io_surface_layer_) {
-    [io_surface_layer_ resetClient];
-    [io_surface_layer_ removeFromSuperlayer];
+}
+
+void BrowserCompositorViewMacInternal::DestroyIOSurfaceLayer(
+    base::scoped_nsobject<CompositingIOSurfaceLayer> io_surface_layer) {
+  if (!io_surface_layer)
+    return;
+  [io_surface_layer resetClient];
+  [io_surface_layer removeFromSuperlayer];
+  if (io_surface_layer == io_surface_layer_)
     io_surface_layer_.reset();
-  }
+}
+
+void BrowserCompositorViewMacInternal::DestroySoftwareLayer() {
+  if (!software_layer_)
+    return;
+  [software_layer_ removeFromSuperlayer];
+  software_layer_.reset();
 }
 
 bool BrowserCompositorViewMacInternal::AcceleratedLayerShouldAckImmediately()
     const {
   // If there is no client then the accelerated layer is not in the hierarchy
   // and will never draw.
   if (!client_)
     return true;
   return client_->BrowserCompositorViewShouldAckImmediately();
 }
 
-void BrowserCompositorViewMacInternal::AcceleratedLayerDidDrawFrame(
-    bool succeeded) {
+void BrowserCompositorViewMacInternal::AcceleratedLayerDidDrawFrame() {
   if (accelerated_output_surface_id_) {
     content::ImageTransportFactory::GetInstance()->OnSurfaceDisplayed(
         accelerated_output_surface_id_);
     accelerated_output_surface_id_ = 0;
   }
 
   if (client_)
     client_->BrowserCompositorViewFrameSwapped(accelerated_latency_info_);
 
   accelerated_latency_info_.clear();
+}
 
-  if (!succeeded) {
-    if (io_surface_layer_)
-      [io_surface_layer_ context]->PoisonContextAndSharegroup();
-    compositor_->ScheduleFullRedraw();
-  }
+void BrowserCompositorViewMacInternal::AcceleratedLayerHitError() {
+  // Perform all acks that would have been done if the frame had succeeded, to
+  // un-block the compositor and renderer.
+  AcceleratedLayerDidDrawFrame();
+
+  // Poison the context being used and request a mulligan.
+  if (io_surface_layer_)
+    [io_surface_layer_ context]->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