Polish Tabstrip and Overlay Issues in Fullscreen

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>
 
 #import "base/auto_reset.h"
 #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_fullscreen_transition.h"
 #import "chrome/browser/ui/cocoa/browser_window_layout.h"
+#import "chrome/browser/ui/cocoa/constrained_window/constrained_window_sheet_controller.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"
@@ skipping 655 matching lines @@
   if (notification)  // For System Fullscreen when non-nil.
     [self registerForContentViewResizeNotifications];
 
   NSWindow* window = [self window];
   savedRegularWindowFrame_ = [window frame];
 
   enteringAppKitFullscreen_ = YES;
   enteringAppKitFullscreenOnPrimaryScreen_ =
       [[[self window] screen] isEqual:[[NSScreen screens] firstObject]];
 
+  [self hideSheetForFullscreenTransition:YES];
+
   // If we are using custom fullscreen animations, the layout will resize
   // in startCustomAnimationToEnterFullScreenWithDuration. In order to prevent
   // multiple resizing messages from being sent to the renderer, we should call
   // adjustUIForEnteringFullscreen after the layout gets resized.
   if (isUsingCustomAnimation_)
     blockLayoutSubviews_ = YES;
   else
     [self adjustUIForEnteringFullscreen];
 }
 
@@ skipping 38 matching lines @@
         CGFloat heightDelta =
             expectedFrame.size.height - currentFrame.size.height;
         if (fabs(heightDelta - kExpectedHeightDifference) > 0.01)
           return;
 
         [[self window] setFrame:expectedFrame display:YES];
     });
     base::MessageLoop::current()->PostTask(FROM_HERE, callback);
   }
 
+  [self hideSheetForFullscreenTransition:NO];
+
   if (notification)  // For System Fullscreen when non-nil.
     [self deregisterForContentViewResizeNotifications];
+
   enteringAppKitFullscreen_ = NO;
   enteringImmersiveFullscreen_ = NO;
   enteringPresentationMode_ = NO;
   isUsingCustomAnimation_ = NO;
 
   [self showFullscreenExitBubbleIfNecessary];
-  [self layoutSubviews];
   browser_->WindowFullscreenStateChanged();
 }
 
 - (void)windowWillExitFullScreen:(NSNotification*)notification {
   if (notification)  // For System Fullscreen when non-nil.
     [self registerForContentViewResizeNotifications];
   exitingAppKitFullscreen_ = YES;
 
   // Like windowWillEnterFullScreen, if we use custom animations,
   // adjustUIForExitingFullscreen should be called after the layout resizes in
   // startCustomAnimationToExitFullScreenWithDuration.
-  if (isUsingCustomAnimation_)
+  if (isUsingCustomAnimation_) {
     blockLayoutSubviews_ = YES;
-  else
+    [self hideSheetForFullscreenTransition:YES];
+
+    // In OSX 10.11, when the NSFullScreenWindowMask is added or removed,
+    // the window's frame and layer changes slightly which causes a janky
+    // movement. As a result, we should disable the content view's autoresize
+    // at the beginning of the animation and set it back to its original value
+    // at the end of the animation.
+    [self.chromeContentView setAutoresizesSubviews:NO];
+  } else {
     [self adjustUIForExitingFullscreen];
+  }
 }
 
 - (void)windowDidExitFullScreen:(NSNotification*)notification {
   DCHECK(exitingAppKitFullscreen_);
 
   if (notification)  // For System Fullscreen when non-nil.
     [self deregisterForContentViewResizeNotifications];
 
   browser_->WindowFullscreenStateChanged();
+  [self.chromeContentView setAutoresizesSubviews:YES];
+
+  [self hideSheetForFullscreenTransition:NO];
 
   exitingAppKitFullscreen_ = NO;
   isUsingCustomAnimation_ = NO;
   fullscreenTransition_.reset();
 
   blockLayoutSubviews_ = NO;
 }
 
 - (void)windowDidFailToEnterFullScreen:(NSWindow*)window {
   [self deregisterForContentViewResizeNotifications];
   enteringAppKitFullscreen_ = NO;
   fullscreenTransition_.reset();
   blockLayoutSubviews_ = NO;
   isUsingCustomAnimation_ = NO;
   [self adjustUIForExitingFullscreenAndStopOmniboxSliding];
 }
 
 - (void)windowDidFailToExitFullScreen:(NSWindow*)window {
   [self deregisterForContentViewResizeNotifications];
   exitingAppKitFullscreen_ = NO;
   fullscreenTransition_.reset();
   isUsingCustomAnimation_ = NO;
   blockLayoutSubviews_ = NO;
+
   // Force a relayout to try and get the window back into a reasonable state.
+  [self.chromeContentView setAutoresizesSubviews:YES];
   [self layoutSubviews];
 }
 
+- (void)hideSheetForFullscreenTransition:(BOOL)shoudHide {
+  if (!isUsingCustomAnimation_)
+    return;
+
+  ConstrainedWindowSheetController* sheet_controller =

[Robert Sesek, 2015/12/04 17:56:30]

naming: sheetController

[spqchan, 2015/12/07 18:27:52]

Done.

+      [ConstrainedWindowSheetController
+          controllerForParentWindow:[self window]];
+  if (sheet_controller) {

[Robert Sesek, 2015/12/04 17:56:30]

You don't need this if, since you can nil-message ObjC objects.

[spqchan, 2015/12/07 18:27:52]

Done.

+    if (shoudHide)
+      [sheet_controller hideSheetForFullscreenTransition];
+    else
+      [sheet_controller unhideSheetForFullscreenTransition];
+  }
+}
+
 - (void)adjustUIForExitingFullscreen {
   [self destroyFullscreenExitBubbleIfNecessary];
   [self adjustUIForExitingFullscreenAndStopOmniboxSliding];
 }
 
 - (void)adjustUIForEnteringFullscreen {
   fullscreen_mac::SlidingStyle style;
   if (browser_->exclusive_access_manager()
           ->fullscreen_controller()
           ->IsWindowFullscreenForTabOrPending()) {
@@ skipping 328 matching lines @@
   if (![self shouldUseCustomAppKitFullscreenTransition:YES])
     return nil;
 
   FramedBrowserWindow* framedBrowserWindow =
       base::mac::ObjCCast<FramedBrowserWindow>([self window]);
   fullscreenTransition_.reset([[BrowserWindowFullscreenTransition alloc]
       initEnterWithWindow:framedBrowserWindow]);
 
   NSArray* customWindows =
       [fullscreenTransition_ customWindowsForFullScreenTransition];
-  isUsingCustomAnimation_ = !customWindows;
+  isUsingCustomAnimation_ = customWindows != nil;
   return customWindows;
 }
 
 - (NSArray*)customWindowsToExitFullScreenForWindow:(NSWindow*)window {
   DCHECK([window isEqual:self.window]);
 
   if (![self shouldUseCustomAppKitFullscreenTransition:NO])
     return nil;
 
   FramedBrowserWindow* framedBrowserWindow =
       base::mac::ObjCCast<FramedBrowserWindow>([self window]);
   fullscreenTransition_.reset([[BrowserWindowFullscreenTransition alloc]
           initExitWithWindow:framedBrowserWindow
                        frame:savedRegularWindowFrame_
       tabStripBackgroundView:[self tabStripBackgroundView]]);
 
   NSArray* customWindows =
       [fullscreenTransition_ customWindowsForFullScreenTransition];
-  isUsingCustomAnimation_ = !customWindows;
+  isUsingCustomAnimation_ = customWindows != nil;
   return customWindows;
 }
 
 - (void)window:(NSWindow*)window
     startCustomAnimationToEnterFullScreenWithDuration:(NSTimeInterval)duration {
   DCHECK([window isEqual:self.window]);
   [fullscreenTransition_ startCustomFullScreenAnimationWithDuration:duration];
 
   base::AutoReset<BOOL> autoReset(&blockLayoutSubviews_, NO);
   [self adjustUIForEnteringFullscreen];
@@ skipping 20 matching lines @@
   return browser_->tab_strip_model()->GetActiveWebContents();
 }
 
 - (PermissionBubbleManager*)permissionBubbleManager {
   if (WebContents* contents = [self webContents])
     return PermissionBubbleManager::FromWebContents(contents);
   return nil;
 }
 
 @end  // @implementation BrowserWindowController(Private)