Switch HTML5 Fullscreen Over to 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"
@@ skipping 198 matching lines @@
 
   // It doesn't make sense to provide a Y higher than the height of the window.
   CGFloat windowHeight = NSHeight([window frame]);
   defaultSheetY = std::min(defaultSheetY, windowHeight);
 
   defaultSheetLocation.origin.y = defaultSheetY;
   return defaultSheetLocation;
 }
 
 - (void)layoutSubviews {
+  if (blockLayoutSubviews_)
+    return;
+
   // Suppress title drawing if necessary.
   if ([self.window respondsToSelector:@selector(setShouldHideTitle:)])
     [(id)self.window setShouldHideTitle:![self hasTitleBar]];
 
   [bookmarkBarController_ updateHiddenState];
   [self updateSubviewZOrder];
 
   base::scoped_nsobject<BrowserWindowLayout> layout(
       [[BrowserWindowLayout alloc] init]);
   [self updateLayoutParameters:layout];
@@ skipping 448 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] objectAtIndex:0]];
 
-  fullscreen_mac::SlidingStyle style;
-  if (browser_->exclusive_access_manager()
-          ->fullscreen_controller()
-          ->IsWindowFullscreenForTabOrPending()) {
-    style = fullscreen_mac::OMNIBOX_TABS_NONE;
-  } else if (enteringPresentationMode_) {
-    style = fullscreen_mac::OMNIBOX_TABS_HIDDEN;
-  } else {
-    style = fullscreen_mac::OMNIBOX_TABS_PRESENT;
-  }
-
-  [self adjustUIForSlidingFullscreenStyle:style];
+  // 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 ([self shouldUseCustomAppKitFullscreenTransition:YES])
+    blockLayoutSubviews_ = YES;
+  else
+    [self adjustUIForEnteringFullscreen];
 }
 
 - (void)windowDidEnterFullScreen:(NSNotification*)notification {
+  blockLayoutSubviews_ = NO;
   fullscreenTransition_.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
   if (base::mac::IsOSYosemiteOrLater()) {
     for (NSWindow* window in [[NSApplication sharedApplication] windows]) {
       if ([window
               isKindOfClass:NSClassFromString(@"NSToolbarFullScreenWindow")]) {
@@ skipping 36 matching lines @@
 
   [self showFullscreenExitBubbleIfNecessary];
   browser_->WindowFullscreenStateChanged();
 }
 
 - (void)windowWillExitFullScreen:(NSNotification*)notification {
   if (notification)  // For System Fullscreen when non-nil.
     [self registerForContentViewResizeNotifications];
   exitingAppKitFullscreen_ = YES;
 
-  [self destroyFullscreenExitBubbleIfNecessary];
-  [self adjustUIForExitingFullscreenAndStopOmniboxSliding];
+  // Like windowWillEnterFullScreen, if we use custom animations,
+  // adjustUIForExitingFullscreen should be called after the layout resizes in
+  // startCustomAnimationToExitFullScreenWithDuration.
+  if ([self shouldUseCustomAppKitFullscreenTransition:NO])
+    blockLayoutSubviews_ = YES;
+  else
+    [self adjustUIForExitingFullscreen];
 }
 
 - (void)windowDidExitFullScreen:(NSNotification*)notification {
   DCHECK(exitingAppKitFullscreen_);
 
   if (notification)  // For System Fullscreen when non-nil.
     [self deregisterForContentViewResizeNotifications];
 
-  // Since the content view was forcefully resized during the transition, we
-  // want to ensure that the subviews are layout correctly after it ended.
-  [self layoutSubviews];
   browser_->WindowFullscreenStateChanged();
 
   exitingAppKitFullscreen_ = NO;
   fullscreenTransition_.reset();
+
+  blockLayoutSubviews_ = NO;
 }
 
 - (void)windowDidFailToEnterFullScreen:(NSWindow*)window {
   [self deregisterForContentViewResizeNotifications];
   enteringAppKitFullscreen_ = NO;
   fullscreenTransition_.reset();
+  blockLayoutSubviews_ = NO;
   [self adjustUIForExitingFullscreenAndStopOmniboxSliding];
 }
 
 - (void)windowDidFailToExitFullScreen:(NSWindow*)window {
   [self deregisterForContentViewResizeNotifications];
   exitingAppKitFullscreen_ = NO;
   fullscreenTransition_.reset();
+  blockLayoutSubviews_ = NO;
   // Force a relayout to try and get the window back into a reasonable state.
   [self layoutSubviews];
 }
 
+- (void)adjustUIForExitingFullscreen {
+  [self destroyFullscreenExitBubbleIfNecessary];
+  [self adjustUIForExitingFullscreenAndStopOmniboxSliding];
+}
+
+- (void)adjustUIForEnteringFullscreen {
+  fullscreen_mac::SlidingStyle style;
+  if (browser_->exclusive_access_manager()
+          ->fullscreen_controller()
+          ->IsWindowFullscreenForTabOrPending()) {
+    style = fullscreen_mac::OMNIBOX_TABS_NONE;
+  } else if (enteringPresentationMode_) {
+    style = fullscreen_mac::OMNIBOX_TABS_HIDDEN;
+  } else {
+    style = fullscreen_mac::OMNIBOX_TABS_PRESENT;
+  }
+
+  [self adjustUIForSlidingFullscreenStyle:style];
+}
+
 - (void)enableBarVisibilityUpdates {
   // Early escape if there's nothing to do.
   if (barVisibilityUpdatesEnabled_)
     return;
 
   barVisibilityUpdatesEnabled_ = YES;
 
   if ([barVisibilityLocks_ count])
     [presentationModeController_ ensureOverlayShownWithAnimation:NO delay:NO];
   else
@@ skipping 274 matching lines @@
     return NO;
 
   return YES;
 }
 
 - (BOOL)shouldUseCustomAppKitFullscreenTransition:(BOOL)enterFullScreen {
   // We are temporary disabling exit fullscreen animation because it only
   // works on OSX 10.10.
   // TODO(spqchan): Fix exit fullscreen animation so that it works on all
   // OSX versions.
-  if (!enterFullScreen)
+  // if (!enterFullScreen)

[erikchen, 2015/10/07 21:51:03]

Huh? What are you trying to do here? If you want the function to always return
"NO", remove the commented out lines, and update the CL description.

[spqchan, 2015/10/07 22:54:01]

This change was accidentally added to this CL when I was testing things on 10.11
Removing it.

     return NO;
-
+    //
   if (base::mac::IsOSMountainLionOrEarlier())
     return NO;
 
   NSView* root = [[self.window contentView] superview];
   if (!root.layer)
     return NO;
 
   // AppKit on OSX 10.9 has a bug for applications linked against OSX 10.8 SDK
   // and earlier. Under specific circumstances, it prevents the custom AppKit
   // transition from working well. See http://crbug.com/396980 for more
@@ skipping 31 matching lines @@
       initExitWithWindow:framedBrowserWindow
                    frame:savedRegularWindowFrame_]);
 
   return [fullscreenTransition_ customWindowsForFullScreenTransition];
 }
 
 - (void)window:(NSWindow*)window
     startCustomAnimationToEnterFullScreenWithDuration:(NSTimeInterval)duration {
   DCHECK([window isEqual:self.window]);
   [fullscreenTransition_ startCustomFullScreenAnimationWithDuration:duration];
+
+  blockLayoutSubviews_ = NO;
+  [self adjustUIForEnteringFullscreen];
+  blockLayoutSubviews_ = YES;
 }
 
 - (void)window:(NSWindow*)window
     startCustomAnimationToExitFullScreenWithDuration:(NSTimeInterval)duration {
   DCHECK([window isEqual:self.window]);
 
   [fullscreenTransition_ startCustomFullScreenAnimationWithDuration:duration];
+
+  blockLayoutSubviews_ = NO;

[erikchen, 2015/10/07 21:51:03]

This code assumes that blockLayoutSubviews_ is YES. Instead, you should use
base/auto_reset.h.

[spqchan, 2015/10/07 22:54:01]

Done.

+  [self adjustUIForExitingFullscreen];
+  blockLayoutSubviews_ = YES;
 }
 
 - (BOOL)shouldConstrainFrameRect {
   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)