diff options
| author | scheib@chromium.org <scheib@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-09 23:43:47 +0000 |
|---|---|---|
| committer | scheib@chromium.org <scheib@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-09 23:43:47 +0000 |
| commit | c5e4699baec7bfc7eb9851ca75f328e7b3b17255 (patch) | |
| tree | 52a53f06180e5260ee45af96f8eae60e257a4996 | |
| parent | 42adbb2be521b1f777695285da9caeb33539c08d (diff) | |
| download | chromium_src-c5e4699baec7bfc7eb9851ca75f328e7b3b17255.zip chromium_src-c5e4699baec7bfc7eb9851ca75f328e7b3b17255.tar.gz chromium_src-c5e4699baec7bfc7eb9851ca75f328e7b3b17255.tar.bz2 | |
Merge 144723 - [Mac] Do not show the fullscreen exit bubble while transitioning. Wait until the transition ends.
Merge approved in roll-up issue crbug.com/134196#c9.
BUG=130649
TEST=Enter HTML5 fullscreen and do not see the desktop background replaced by a webpage. See the exit bubble once the transition completes.
Review URL: https://chromiumcodereview.appspot.com/10694018
TBR=rsesek@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10756021
git-svn-id: svn://svn.chromium.org/chrome/branches/1180/src@145794 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/ui/cocoa/browser_window_controller_private.mm | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/chrome/browser/ui/cocoa/browser_window_controller_private.mm b/chrome/browser/ui/cocoa/browser_window_controller_private.mm index ee0310d..c62811d 100644 --- a/chrome/browser/ui/cocoa/browser_window_controller_private.mm +++ b/chrome/browser/ui/cocoa/browser_window_controller_private.mm @@ -793,6 +793,14 @@ willPositionSheet:(NSWindow*)sheet } - (void)showFullscreenExitBubbleIfNecessary { + // This method is called in response to + // |-updateFullscreenExitBubbleURL:bubbleType:|. If on Lion the system is + // transitioning, do not show the bubble because it will cause visual jank + // <http://crbug.com/130649>. This will be called again as part of + // |-windowDidEnterFullScreen:|, so arrange to do that work then instead. + if (enteringFullscreen_) + return; + [presentationModeController_ ensureOverlayHiddenWithAnimation:NO delay:NO]; if (fullscreenBubbleType_ == FEB_TYPE_NONE || |