Implemented fullscreen exit animation with AppKit

chrome/browser/ui/cocoa/browser_window_controller_private.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.
 
 #import "chrome/browser/ui/cocoa/browser_window_controller_private.h"
 
 #include <cmath>
 
 #include "base/command_line.h"
 #include "base/mac/bind_objc_block.h"
 #include "base/mac/foundation_util.h"
 #include "base/mac/mac_util.h"
 #import "base/mac/scoped_nsobject.h"
 #import "base/mac/sdk_forward_declarations.h"
 #include "base/metrics/histogram.h"
 #include "base/prefs/pref_service.h"
 #include "base/prefs/scoped_user_pref_update.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/fullscreen.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_avatar_icon_util.h"
 #include "chrome/browser/ui/bookmarks/bookmark_tab_helper.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window_state.h"
-#import "chrome/browser/ui/cocoa/browser_window_enter_fullscreen_transition.h"
+#import "chrome/browser/ui/cocoa/browser_window_fullscreen_transition.h"
 #import "chrome/browser/ui/cocoa/browser_window_layout.h"
 #import "chrome/browser/ui/cocoa/custom_frame_view.h"
 #import "chrome/browser/ui/cocoa/dev_tools_controller.h"
 #import "chrome/browser/ui/cocoa/fast_resize_view.h"
 #import "chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.h"
 #import "chrome/browser/ui/cocoa/floating_bar_backing_view.h"
 #import "chrome/browser/ui/cocoa/framed_browser_window.h"
 #import "chrome/browser/ui/cocoa/fullscreen_window.h"
 #import "chrome/browser/ui/cocoa/infobars/infobar_container_controller.h"
 #include "chrome/browser/ui/cocoa/last_active_browser_cocoa.h"
 #import "chrome/browser/ui/cocoa/presentation_mode_controller.h"
 #import "chrome/browser/ui/cocoa/profiles/avatar_button_controller.h"
 #import "chrome/browser/ui/cocoa/profiles/avatar_icon_controller.h"
 #import "chrome/browser/ui/cocoa/status_bubble_mac.h"
 #import "chrome/browser/ui/cocoa/tab_contents/overlayable_contents_controller.h"
+#import "chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.h"
 #import "chrome/browser/ui/cocoa/tabs/tab_strip_view.h"
 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h"
 #import "chrome/browser/ui/cocoa/website_settings/permission_bubble_cocoa.h"
 #include "chrome/browser/ui/exclusive_access/fullscreen_controller.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/website_settings/permission_bubble_manager.h"
 #include "chrome/common/chrome_switches.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/web_contents.h"
 #import "ui/base/cocoa/focus_tracker.h"
@@ skipping 163 matching lines @@
   defaultSheetLocation.origin.y = defaultSheetY;
   return defaultSheetLocation;
 }
 
 - (void)layoutSubviews {
   // Suppress title drawing if necessary.
   if ([self.window respondsToSelector:@selector(setShouldHideTitle:)])
     [(id)self.window setShouldHideTitle:![self hasTitleBar]];
 
   [bookmarkBarController_ updateHiddenState];
+

[erikchen, 2015/08/11 22:42:54]

please don't randomly add whitespace

[spqchan1, 2015/08/12 19:34:41]

Done.

   [self updateSubviewZOrder];
 
   base::scoped_nsobject<BrowserWindowLayout> layout(
       [[BrowserWindowLayout alloc] init]);
   [self updateLayoutParameters:layout];
   [self applyLayout:layout];
 
   [toolbarController_ setDividerOpacity:[self toolbarDividerOpacity]];
 
   // Will update the location of the permission bubble when showing/hiding the
@@ skipping 465 matching lines @@
       [[[self window] screen] isEqual:[[NSScreen screens] objectAtIndex:0]];
 
   fullscreen_mac::SlidingStyle style =
       mode ? fullscreen_mac::OMNIBOX_TABS_HIDDEN
            : fullscreen_mac::OMNIBOX_TABS_PRESENT;
 
   [self adjustUIForSlidingFullscreenStyle:style];
 }
 
 - (void)windowDidEnterFullScreen:(NSNotification*)notification {
-  enterFullscreenTransition_.reset();
-
   // In Yosemite, some combination of the titlebar and toolbar always show in
   // full-screen mode. We do not want either to show. Search for the window that
   // contains the views, and hide it. There is no need to ever unhide the view.
   // http://crbug.com/380235
+  fullscreenTransition_.reset();

[erikchen, 2015/08/11 22:42:54]

I see that you changed s/enterFullscreenTransition_/fullscreenTransition_, but
why did you move its location? You moved it under a comment, which implies that
the comment applies to it.

[spqchan1, 2015/08/12 19:34:41]

Originally, fullscreenTransition was going take care of both enter and exit
transition. The object would be created at enterTransition and then removed at
exitTransition.

However, after refactoring the code, it made more sense to create the object at
the beginning of enterTransition and then destroy it at the end of
enterTransition. The same thing will happen with exitTransition. As such, I
added back fullscreenTransition_.reset()

Anyways, I'll move it back to the top of the method. Note: in
windowDidExitFullScreen, I moved reset() to the end because I want the layout to
be updated before getting rid of the fullscreenTransition object (which contains
the window size layout parameter logic)

   if (base::mac::IsOSYosemiteOrLater()) {
     for (NSWindow* window in [[NSApplication sharedApplication] windows]) {
       if ([window
               isKindOfClass:NSClassFromString(@"NSToolbarFullScreenWindow")]) {
         [[window contentView] setHidden:YES];
       }
     }
   }
 
   if ([self shouldUseMavericksAppKitFullscreenHack]) {
@@ skipping 29 matching lines @@
   enteringPresentationMode_ = NO;
 
   [self showFullscreenExitBubbleIfNecessary];
   browser_->WindowFullscreenStateChanged();
   [[[self window] contentView] setWantsLayer:windowViewWantsLayer_];
 }
 
 - (void)windowWillExitFullScreen:(NSNotification*)notification {
   if (notification)  // For System Fullscreen when non-nil.
     [self registerForContentViewResizeNotifications];
+  exitingAppKitFullscreen_ = YES;
+
   [self destroyFullscreenExitBubbleIfNecessary];
   [self adjustUIForExitingFullscreenAndStopOmniboxSliding];
 }
 
 - (void)windowDidExitFullScreen:(NSNotification*)notification {
+  DCHECK(exitingAppKitFullscreen_);
+
   if (notification)  // For System Fullscreen when non-nil.
     [self deregisterForContentViewResizeNotifications];
+
+  FramedBrowserWindow* framedBrowserWindow =
+      base::mac::ObjCCast<FramedBrowserWindow>([self window]);
+  [framedBrowserWindow setFrameAndStyleMaskLock:NO];
+
+  [self layoutSubviews];
   browser_->WindowFullscreenStateChanged();
+
+  exitingAppKitFullscreen_ = NO;
+  fullscreenTransition_.reset();
 }
 
 - (void)windowDidFailToEnterFullScreen:(NSWindow*)window {
   [self deregisterForContentViewResizeNotifications];
   enteringAppKitFullscreen_ = NO;
+  fullscreenTransition_.reset();
   [self adjustUIForExitingFullscreenAndStopOmniboxSliding];
 }
 
 - (void)windowDidFailToExitFullScreen:(NSWindow*)window {
   [self deregisterForContentViewResizeNotifications];
-
+  exitingAppKitFullscreen_ = NO;
+  fullscreenTransition_.reset();
+  FramedBrowserWindow* framedBrowserWindow =
+      base::mac::ObjCCast<FramedBrowserWindow>([self window]);
+  [framedBrowserWindow setFrameAndStyleMaskLock:NO];
   // Force a relayout to try and get the window back into a reasonable state.
   [self layoutSubviews];
 }
 
 - (void)enableBarVisibilityUpdates {
   // Early escape if there's nothing to do.
   if (barVisibilityUpdatesEnabled_)
     return;
 
   barVisibilityUpdatesEnabled_ = YES;
@@ skipping 76 matching lines @@
   // We need to return where the button should be positioned.
   NSView* rootView = [[[self window] contentView] superview];
   if ([rootView respondsToSelector:@selector(_fullScreenButtonOrigin)])
     buttonFrame.origin = [rootView _fullScreenButtonOrigin];
 
   return buttonFrame;
 }
 
 - (void)updateLayoutParameters:(BrowserWindowLayout*)layout {
   [layout setContentViewSize:[[[self window] contentView] bounds].size];
-  [layout setWindowSize:[[self window] frame].size];
+
+  NSSize windowSize = (fullscreenTransition_.get())
+                          ? [fullscreenTransition_ getDesiredWindowLayoutSize]
+                          : [[self window] frame].size;
+
+  [layout setWindowSize:windowSize];
 
   [layout setInAnyFullscreen:[self isInAnyFullscreenMode]];
   [layout setFullscreenSlidingStyle:
       presentationModeController_.get().slidingStyle];
   [layout setFullscreenMenubarOffset:
       [presentationModeController_ menubarOffset]];
   [layout setFullscreenToolbarFraction:
       [presentationModeController_ toolbarFraction]];
 
   [layout setHasTabStrip:[self hasTabStrip]];
@@ skipping 197 matching lines @@
 
   return YES;
 }
 
 - (NSArray*)customWindowsToEnterFullScreenForWindow:(NSWindow*)window {
   DCHECK([window isEqual:self.window]);
 
   if (![self shouldUseCustomAppKitFullscreenTransition])
     return nil;
 
-  enterFullscreenTransition_.reset(
-      [[BrowserWindowEnterFullscreenTransition alloc]
-          initWithWindow:self.window]);
-  return [enterFullscreenTransition_ customWindowsToEnterFullScreen];
+  FramedBrowserWindow* framedBrowserWindow =
+      base::mac::ObjCCast<FramedBrowserWindow>([self window]);
+  fullscreenTransition_.reset([[BrowserWindowFullscreenTransition alloc]
+      initEnterWithWindow:framedBrowserWindow]);
+  return [fullscreenTransition_ customWindowsForFullScreenTransition];
+}
+
+- (NSArray*)customWindowsToExitFullScreenForWindow:(NSWindow*)window {
+  DCHECK([window isEqual:self.window]);
+
+  if (![self shouldUseCustomAppKitFullscreenTransition])
+    return nil;
+
+  FramedBrowserWindow* framedBrowserWindow =
+      base::mac::ObjCCast<FramedBrowserWindow>([self window]);
+  fullscreenTransition_.reset([[BrowserWindowFullscreenTransition alloc]
+      initExitWithWindow:framedBrowserWindow
+                   frame:savedRegularWindowFrame_]);
+
+  return [fullscreenTransition_ customWindowsForFullScreenTransition];
 }
 
 - (void)window:(NSWindow*)window
     startCustomAnimationToEnterFullScreenWithDuration:(NSTimeInterval)duration {
   DCHECK([window isEqual:self.window]);
-  [enterFullscreenTransition_
-      startCustomAnimationToEnterFullScreenWithDuration:duration];
+  [fullscreenTransition_ startCustomFullScreenAnimationWithDuration:duration];
+}
+
+- (void)window:(NSWindow*)window
+    startCustomAnimationToExitFullScreenWithDuration:(NSTimeInterval)duration {
+  DCHECK([window isEqual:self.window]);
+
+  [fullscreenTransition_ startCustomFullScreenAnimationWithDuration:duration];
 }
 
 - (BOOL)shouldConstrainFrameRect {
-  if ([enterFullscreenTransition_ shouldWindowBeUnconstrained])
+  if ([fullscreenTransition_ shouldWindowBeUnconstrained])
     return NO;
 
   return [super shouldConstrainFrameRect];
 }
 
 - (WebContents*)webContents {
   return browser_->tab_strip_model()->GetActiveWebContents();
 }
 
 - (PermissionBubbleManager*)permissionBubbleManager {
   if (WebContents* contents = [self webContents])
     return PermissionBubbleManager::FromWebContents(contents);
   return nil;
 }
 
 @end  // @implementation BrowserWindowController(Private)