Fix Fullscreen Animation Crash

chrome/browser/ui/cocoa/browser_window_fullscreen_transition.mm

 // Copyright 2015 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.
 
 #import "chrome/browser/ui/cocoa/browser_window_fullscreen_transition.h"
 
 #include <QuartzCore/QuartzCore.h>
 
 #include "base/mac/bind_objc_block.h"
 #include "base/mac/foundation_util.h"
@@ skipping 146 matching lines @@
 //    - Set the size to the screen's size.
 - (void)preparePrimaryWindowForAnimation;
 
 // Applies the fullscreen animation to |snapshotLayer_|.
 - (void)animateSnapshotWindowWithDuration:(CGFloat)duration;
 
 // Sets |primaryWindow_|'s frame to the expected frame.
 - (void)changePrimaryWindowToFinalFrame;
 
 // Override of CAAnimation delegate method.
-- (void)animationDidStop:(CAAnimation*)theAnimation finished:(BOOL)flag;
+- (void)animationDidStop:(CAAnimation*)theAnimation finished:(BOOL)finished;
 
 // Returns the layer of the root view of |window|.
 - (CALayer*)rootLayerOfWindow:(NSWindow*)window;
 
 // Convert the point to be relative to the screen the primary window is on.
 // This is important because if we're using multiple screens, the coordinate
 // system extends to the second screen.
 //
 // For example, if the screen width is 1440, the second screen's frame origin
 // is located at (1440, 0) and any x coordinate on the second screen will be
@@ skipping 69 matching lines @@
 
 - (BOOL)shouldWindowBeUnconstrained {
   return changingPrimaryWindowSize_;
 }
 
 - (NSSize)desiredWindowLayoutSize {
   return isEnteringFullscreen_ ? [primaryWindow_ frame].size
                                : [[primaryWindow_ contentView] bounds].size;
 }
 
+- (void)browserWillBeDestroyed {
+  CALayer* root = [self rootLayerOfWindow:primaryWindow_];
+  [root removeAllAnimations];
+  [snapshotLayer_ removeAllAnimations];
+
+  controller_ = nullptr;

[Robert Sesek, 2016/04/04 18:13:50]

nullptr -> nil

[spqchan, 2016/04/04 18:40:35]

Done.

+}
+
 // -------------------------Private Methods----------------------------
 
 - (void)takeSnapshot {
   base::ScopedCFTypeRef<CGImageRef> windowSnapshot(CGWindowListCreateImage(
       CGRectNull, kCGWindowListOptionIncludingWindow,
       [primaryWindow_ windowNumber], kCGWindowImageBoundsIgnoreFraming));
   snapshotLayer_.reset([[CALayer alloc] init]);
   [snapshotLayer_ setFrame:NSRectToCGRect([primaryWindow_ frame])];
   [snapshotLayer_ setContents:static_cast<id>(windowSnapshot.get())];
   [snapshotLayer_ setAnchorPoint:CGPointMake(0, 0)];
@@ skipping 199 matching lines @@
   CALayer* root = [self rootLayerOfWindow:primaryWindow_];
   [root addAnimation:group forKey:kPrimaryWindowAnimationID];
 }
 
 - (void)changePrimaryWindowToFinalFrame {
   changingPrimaryWindowSize_ = YES;
   [primaryWindow_ setFrame:finalFrame_ display:NO];
   changingPrimaryWindowSize_ = NO;
 }
 
-- (void)animationDidStop:(CAAnimation*)theAnimation finished:(BOOL)flag {
+- (void)animationDidStop:(CAAnimation*)theAnimation finished:(BOOL)finished {
   NSString* animationID = [theAnimation valueForKey:kAnimationIDKey];
 
   // Remove the snapshot window.
   if ([animationID isEqual:kSnapshotWindowAnimationID]) {
     [snapshotWindow_ orderOut:nil];
     snapshotWindow_.reset();
     snapshotLayer_.reset();
     return;
   }
 
@@ skipping 30 matching lines @@
     DCHECK_EQ(NSWidth(content.frame), expectedSize.width);
 
     // Restore the state of the primary window and make it visible again.
     [primaryWindow_ setOpaque:primaryWindowInitialOpaque_];
     [primaryWindow_ setBackgroundColor:primaryWindowInitialBackgroundColor_];
 
     CALayer* root = [self rootLayerOfWindow:primaryWindow_];
     [root removeAnimationForKey:kPrimaryWindowAnimationID];
     root.opacity = 1;
 
-    if (!isEnteringFullscreen_)
+    completedTransition_ = YES;
+
+    if (!isEnteringFullscreen_ && controller_)

[Robert Sesek, 2016/04/04 18:13:50]

Don't need the && controller_ since it's an ObjC object and messaging nil is a
noop.

[spqchan, 2016/04/04 18:40:35]

Done.

       [controller_ exitFullscreenAnimationFinished];
   }
-
-  completedTransition_ = YES;
 }
 
 - (CALayer*)rootLayerOfWindow:(NSWindow*)window {
   return [[[window contentView] superview] layer];
 }
 
 - (NSPoint)pointRelativeToCurrentScreen:(NSPoint)point {
   NSRect screenFrame = [[primaryWindow_ screen] frame];
   return NSMakePoint(point.x - screenFrame.origin.x,
                      point.y - screenFrame.origin.y);
 }
 
 @end