Mac: Recreate browser-side GL contexts on GPU switch

content/browser/renderer_host/render_widget_host_view_mac.mm

 // Copyright (c) 2012 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/renderer_host/render_widget_host_view_mac.h"
 
 #import <objc/runtime.h>
 #include <QuartzCore/QuartzCore.h>
 
 #include "base/basictypes.h"
@@ skipping 362 matching lines @@
   results.deviceScaleFactor = static_cast<int>(display.device_scale_factor());
   results.depth = NSBitsPerPixelFromDepth([screen depth]);
   results.depthPerComponent = NSBitsPerSampleFromDepth([screen depth]);
   results.isMonochrome =
       [[screen colorSpace] colorSpaceModel] == NSGrayColorSpaceModel;
   results.rect = display.bounds();
   results.availableRect = display.work_area();
   return results;
 }
 
+void RemoveLayerFromSuperlayer(

[Zhenyao Mo, 2014/04/09 22:24:24]

This is never called.

[ccameron, 2014/04/09 22:37:28]

This is wrapped up in the ScopedClosureRunner below, which executes it at the
end of the function.

+    base::scoped_nsobject<CompositingIOSurfaceLayer> layer) {
+  // Disable the fade-out animation as the layer is removed.
+  ScopedCAActionDisabler disabler;
+  [layer removeFromSuperlayer];
+}
+
 }  // namespace
 
 namespace content {
 
 ///////////////////////////////////////////////////////////////////////////////
 // RenderWidgetHostView, public:
 
 // static
 RenderWidgetHostView* RenderWidgetHostView::CreateViewForWidget(
     RenderWidgetHost* widget) {
@@ skipping 173 matching lines @@
 
   compositing_iosurface_layer_.reset([[CompositingIOSurfaceLayer alloc]
       initWithRenderWidgetHostViewMac:this]);
   DCHECK(compositing_iosurface_layer_);
 
   // Disable the fade-in animation as the layer is added.
   ScopedCAActionDisabler disabler;
   [background_layer_ addSublayer:compositing_iosurface_layer_];
 }
 
-void RenderWidgetHostViewMac::DestroyCompositedIOSurfaceLayer() {
+void RenderWidgetHostViewMac::DestroyCompositedIOSurfaceLayer(
+    DestroyCompositedIOSurfaceLayerBehavior destroy_layer_behavior) {
   if (!compositing_iosurface_layer_)
     return;
 
-  // Disable the fade-out animation as the layer is removed.
-  ScopedCAActionDisabler disabler;
-  [compositing_iosurface_layer_ removeFromSuperlayer];
+  if (destroy_layer_behavior == kRemoveLayerFromHierarchy) {
+    // Disable the fade-out animation as the layer is removed.
+    ScopedCAActionDisabler disabler;
+    [compositing_iosurface_layer_ removeFromSuperlayer];
+  }
   [compositing_iosurface_layer_ disableCompositing];
   compositing_iosurface_layer_.reset();
 }
 
 void RenderWidgetHostViewMac::DestroyCompositedIOSurfaceAndLayer(
     DestroyContextBehavior destroy_context_behavior) {
   // Any pending frames will not be displayed, so ack them now.
   SendPendingSwapAck();
 
-  DestroyCompositedIOSurfaceLayer();
+  DestroyCompositedIOSurfaceLayer(kRemoveLayerFromHierarchy);
   compositing_iosurface_.reset();
 
   switch (destroy_context_behavior) {
     case kLeaveContextBoundToView:
       break;
     case kDestroyContext:
       ClearBoundContextDrawable();
       compositing_iosurface_context_ = NULL;
       break;
     default:
@@ skipping 744 matching lines @@
     return;
 
   // Ensure that if this function exits before the frame is set up (but not
   // necessarily drawn) then it is treated as an error.
   base::ScopedClosureRunner scoped_error(
       base::Bind(&RenderWidgetHostViewMac::GotAcceleratedCompositingError,
                  weak_factory_.GetWeakPtr()));
 
   AddPendingLatencyInfo(latency_info);
 
+  // If compositing_iosurface_ exists and has been poisoned, destroy it
+  // and allow EnsureCompositedIOSurface to recreate it below. Keep a
+  // reference to the destroyed layer around until after the below call
+  // to LayoutLayers, to avoid flickers.
+  base::ScopedClosureRunner scoped_layer_remover;
+  if (compositing_iosurface_context_ &&
+      compositing_iosurface_context_->HasBeenPoisoned()) {
+    scoped_layer_remover.Reset(
+        base::Bind(RemoveLayerFromSuperlayer, compositing_iosurface_layer_));
+    DestroyCompositedIOSurfaceLayer(kLeaveLayerInHierarchy);
+    DestroyCompositedIOSurfaceAndLayer(kDestroyContext);
+  }
+
   // Ensure compositing_iosurface_ and compositing_iosurface_context_ be
   // allocated.
   if (!EnsureCompositedIOSurface()) {
     LOG(ERROR) << "Failed EnsureCompositingIOSurface";
     return;
   }
 
   // Make the context current and update the IOSurface with the handle
   // passed in by the swap command.
   {
@@ skipping 653 matching lines @@
   }
 }
 
 void RenderWidgetHostViewMac::WindowFrameChanged() {
   if (render_widget_host_) {
     render_widget_host_->Send(new ViewMsg_WindowFrameChanged(
         render_widget_host_->GetRoutingID(), GetBoundsInRootWindow(),
         GetViewBounds()));
   }
 
-  if (compositing_iosurface_) {
+  if (compositing_iosurface_ && !use_core_animation_) {

[ccameron, 2014/04/09 22:06:01]

There is no migration in non-CoreAnimation mode, so this did nothing.

     // This will migrate the context to the appropriate window.
     if (!EnsureCompositedIOSurface())
       GotAcceleratedCompositingError();
   }
 }
 
 void RenderWidgetHostViewMac::ShowDefinitionForSelection() {
   RenderWidgetHostViewMacDictionaryHelper helper(this);
   helper.ShowDefinitionForSelection();
 }
@@ skipping 181 matching lines @@
 
   // Dynamically calling setContentsScale on a CAOpenGLLayer for which
   // setAsynchronous is dynamically toggled can result in flashes of corrupt
   // content. Work around this by replacing the entire layer when the scale
   // factor changes.
   if (compositing_iosurface_ &&
       [compositing_iosurface_layer_
           respondsToSelector:(@selector(contentsScale))]) {
     if (compositing_iosurface_->scale_factor() !=
         [compositing_iosurface_layer_ contentsScale]) {
-      DestroyCompositedIOSurfaceLayer();
+      DestroyCompositedIOSurfaceLayer(kRemoveLayerFromHierarchy);
       EnsureCompositedIOSurfaceLayer();
     }
   }
   if (compositing_iosurface_ && compositing_iosurface_layer_) {
     CGRect layer_bounds = CGRectMake(
       0,
       0,
       compositing_iosurface_->dip_io_surface_size().width(),
       compositing_iosurface_->dip_io_surface_size().height());
     CGPoint layer_position = CGPointMake(
@@ skipping 2044 matching lines @@
 }
 
 - (void)disableRendering {
   // Disable the fade-out animation as the layer is removed.
   ScopedCAActionDisabler disabler;
   [self removeFromSuperlayer];
   renderWidgetHostView_ = nil;
 }
 
 @end  // implementation SoftwareLayer