mac, fullscreen: Several bug fixes after major refactor.

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/mac_util.h"
@@ skipping 180 matching lines @@
   // Suppress title drawing if necessary.
   if ([window respondsToSelector:@selector(setShouldHideTitle:)])
     [(id)window setShouldHideTitle:![self hasTitleBar]];
 
   // Update z-order. The code below depends on this.
   [self updateSubviewZOrder:[self isInFullscreenWithOmniboxSliding]];
 
   CGFloat floatingBarHeight = [self floatingBarHeight];
   CGFloat yOffset = 0;
   if ([self isInFullscreenWithOmniboxSliding]) {
-    switch (fullscreenStyle_) {
+    yOffset += [presentationModeController_ menubarOffset];
+    switch (presentationModeController_.get().slidingStyle) {
       case fullscreen_mac::OMNIBOX_TABS_PRESENT:
-        // In system fullscreen mode, |yOffset| accounts for the extra offset
-        // needed to dodge the menu bar.
-        yOffset = -std::floor(
-                      (floatingBarShownFraction_) *
-                      [presentationModeController_ floatingBarVerticalOffset]);
         break;
       case fullscreen_mac::OMNIBOX_PRESENT: {
         // At rest: omnibox showing. yOffset should be tabstrip height
         // When cursor is at top: everything shows. yOffset should be -menubar
         // height.
         CGFloat tabStripHeight = 0;
         if ([self hasTabStrip])
           tabStripHeight = NSHeight([[self tabStripView] frame]);
-        yOffset = std::floor(
-            (1 - floatingBarShownFraction_) * tabStripHeight -
-            floatingBarShownFraction_ *
-                [presentationModeController_ floatingBarVerticalOffset]);
+        yOffset +=
+            std::floor((1 - presentationModeController_.get().toolbarFraction) *
+                       tabStripHeight);
         break;
       }
       case fullscreen_mac::OMNIBOX_TABS_HIDDEN:
         // In presentation mode, |yOffset| accounts for the sliding position of
         // the floating bar and the extra offset needed to dodge the menu bar.
-        yOffset =
-            std::floor((1 - floatingBarShownFraction_) * floatingBarHeight) -
-            [presentationModeController_ floatingBarVerticalOffset];
+        yOffset +=
+            std::floor((1 - presentationModeController_.get().toolbarFraction) *
+                       floatingBarHeight);
         break;
     }
   }
 
   CGFloat maxY = NSMaxY(contentBounds) + yOffset;
 
   if ([self hasTabStrip]) {
     // If we need to lay out the top tab strip, replace |maxY| with a higher
     // value, and then lay out the tab strip.
     NSRect windowFrame = [contentView convertRect:[window frame] fromView:nil];
@@ skipping 22 matching lines @@
   [self layoutFloatingBarBackingView:floatingBarBackingRect
                     presentationMode:[self isInFullscreenWithOmniboxSliding]];
 
   // Place the find bar immediately below the toolbar/attached bookmark bar. In
   // presentation mode, it hangs off the top of the screen when the bar is
   // hidden.
   [findBarCocoaController_ positionFindBarViewAtMaxY:maxY maxWidth:width];
   [fullscreenExitBubbleController_ positionInWindowAtTop:maxY width:width];
 
   if ([self isInFullscreenWithOmniboxSliding]) {
-    switch (fullscreenStyle_) {
+    switch (presentationModeController_.get().slidingStyle) {
       case fullscreen_mac::OMNIBOX_TABS_PRESENT:
       case fullscreen_mac::OMNIBOX_PRESENT:
         // Do nothing in Canonical Fullscreen and Simplified Fullscreen. All
         // content slides.
         break;
       case fullscreen_mac::OMNIBOX_TABS_HIDDEN:
         // If in presentation mode, reset |maxY| to top of screen, so that the
         // floating bar slides over the things which appear to be in the content
         // area.
         maxY = NSMaxY(contentBounds);
@@ skipping 432 matching lines @@
 - (void)adjustUIForExitingFullscreenAndStopOmniboxSliding {
   [presentationModeController_ exitPresentationMode];
   presentationModeController_.reset();
 
   // Force the bookmark bar z-order to update.
   [[bookmarkBarController_ view] removeFromSuperview];
   [self layoutSubviews];
 }
 
 - (void)adjustUIForSlidingFullscreenStyle:(fullscreen_mac::SlidingStyle)style {
-  fullscreenStyle_ = style;
-
   if (!presentationModeController_) {
     presentationModeController_.reset(
-        [[PresentationModeController alloc] initWithBrowserController:self]);
+        [[PresentationModeController alloc] initWithBrowserController:self
+                                                                style:style]);
     [self configurePresentationModeController];
+  } else {
+    presentationModeController_.get().slidingStyle = style;
   }
 
   if (!floatingBarBackingView_.get() &&
       ([self hasTabStrip] || [self hasToolbar] || [self hasLocationBar])) {
     floatingBarBackingView_.reset(
         [[FloatingBarBackingView alloc] initWithFrame:NSZeroRect]);
     [floatingBarBackingView_
         setAutoresizingMask:(NSViewWidthSizable | NSViewMinYMargin)];
   }
 
@@ skipping 350 matching lines @@
                        relativeTo:[self tabContentArea]];
   }
 
   // TODO(erikchen): Remove and then add the tabStripView to the root NSView.
   // This fixes a layer ordering problem that occurs between the contentView
   // and the tabStripView. This is a hack required because NSThemeFrame is not
   // layer backed, and because Chrome adds subviews directly to the
   // NSThemeFrame.
   // http://crbug.com/407921
   if (enteringAppKitFullscreen_) {
-    // Disable implicit animations.
-    [CATransaction begin];
-    [CATransaction setDisableActions:YES];
+    // The tabstrip frequently lies outside the bounds of its superview.
+    // Repeatedly adding/removing the tabstrip from its superview during the
+    // AppKit Fullscreen transition causes graphical glitches on 10.10. The
+    // correct solution is to use the AppKit fullscreen transition APIs added
+    // in 10.7+.
+    // http://crbug.com/408791
+    if (!hasAdjustedTabStripWhileEnteringAppKitFullscreen_) {
+      // Disable implicit animations.
+      [CATransaction begin];
+      [CATransaction setDisableActions:YES];
 
-    // Get the current position of the tabStripView.
-    NSView* superview = [[self tabStripView] superview];
-    NSArray* subviews = [superview subviews];
-    NSInteger index = [subviews indexOfObject:[self tabStripView]];
-    NSView* siblingBelow = nil;
-    if (index > 0)
-      siblingBelow = [subviews objectAtIndex:index - 1];
+      // Get the current position of the tabStripView.
+      NSView* superview = [[self tabStripView] superview];
+      NSArray* subviews = [superview subviews];
+      NSInteger index = [subviews indexOfObject:[self tabStripView]];
+      NSView* siblingBelow = nil;
+      if (index > 0)
+        siblingBelow = [subviews objectAtIndex:index - 1];
 
-    // Remove the tabStripView.
-    [[self tabStripView] removeFromSuperview];
+      // Remove the tabStripView.
+      [[self tabStripView] removeFromSuperview];
 
-    // Add it to the same position.
-    if (siblingBelow) {
-      [superview addSubview:[self tabStripView]
-                 positioned:NSWindowAbove
-                 relativeTo:siblingBelow];
-    } else {
-      [superview addSubview:[self tabStripView]
-                 positioned:NSWindowBelow
-                 relativeTo:nil];
+      // Add it to the same position.
+      if (siblingBelow) {
+        [superview addSubview:[self tabStripView]
+                   positioned:NSWindowAbove
+                   relativeTo:siblingBelow];
+      } else {
+        [superview addSubview:[self tabStripView]
+                   positioned:NSWindowBelow
+                   relativeTo:nil];
+      }
+
+      [CATransaction commit];
+      hasAdjustedTabStripWhileEnteringAppKitFullscreen_ = YES;
     }
-
-    [CATransaction commit];
+  } else {
+    hasAdjustedTabStripWhileEnteringAppKitFullscreen_ = NO;
   }
 }
 
 - (void)updateInfoBarTipVisibility {
   // If there's no toolbar then hide the infobar tip.
   [infoBarContainerController_
       setShouldSuppressTopInfoBarTip:![self hasToolbar]];
 }
 
 - (NSInteger)infoBarMaxTopArrowHeight {
@@ skipping 23 matching lines @@
 
 - (void)exitAppKitFullscreen {
   DCHECK(base::mac::IsOSLionOrLater());
   if (FramedBrowserWindow* framedBrowserWindow =
           base::mac::ObjCCast<FramedBrowserWindow>([self window])) {
     [framedBrowserWindow toggleSystemFullScreen];
   }
 }
 
 @end  // @implementation BrowserWindowController(Private)