Fix restoring a window after maximizing it. (Mac)

chrome/browser/ui/cocoa/apps/native_app_window_cocoa.mm

 // Copyright 2013 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.
 
 #include "chrome/browser/ui/cocoa/apps/native_app_window_cocoa.h"
 
 #include "apps/app_shim/extension_app_shim_handler_mac.h"
 #include "base/command_line.h"
 #include "base/mac/mac_util.h"
 #include "base/strings/sys_string_conversions.h"
@@ skipping 38 matching lines @@
 
 // Replicate specific 10.7 SDK declarations for building with prior SDKs.
 #if !defined(MAC_OS_X_VERSION_10_7) || \
     MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7
 
 @interface NSWindow (LionSDKDeclarations)
 - (void)toggleFullScreen:(id)sender;
 @end
 
 enum {
-  NSWindowCollectionBehaviorFullScreenPrimary = 1 << 7
+  NSWindowCollectionBehaviorFullScreenPrimary = 1 << 7,
+  NSFullScreenWindowMask = 1 << 14
 };
 
 #endif  // MAC_OS_X_VERSION_10_7
 
 @implementation NativeAppWindowController
 
 @synthesize appWindow = appWindow_;
 
 - (void)windowWillClose:(NSNotification*)notification {
   if (appWindow_)
     appWindow_->WindowWillClose();
 }
 
 - (void)windowDidBecomeKey:(NSNotification*)notification {
   if (appWindow_)
     appWindow_->WindowDidBecomeKey();
 }
 
 - (void)windowDidResignKey:(NSNotification*)notification {
   if (appWindow_)
     appWindow_->WindowDidResignKey();
 }
 
 - (void)windowDidResize:(NSNotification*)notification {
   if (appWindow_)
     appWindow_->WindowDidResize();
 }
 
+- (void)windowDidEndLiveResize:(NSNotification*)notification {
+  if (appWindow_)
+    appWindow_->WindowDidFinishResize();
+}
+
+- (void)windowDidEnterFullScreen:(NSNotification*)notification {
+  if (appWindow_)
+    appWindow_->WindowDidFinishResize();
+}
+
+- (void)windowDidExitFullScreen:(NSNotification*)notification {
+  if (appWindow_)
+    appWindow_->WindowDidFinishResize();
+}
+
 - (void)windowDidMove:(NSNotification*)notification {
   if (appWindow_)
     appWindow_->WindowDidMove();
 }
 
 - (void)windowDidMiniaturize:(NSNotification*)notification {
   if (appWindow_)
     appWindow_->WindowDidMiniaturize();
 }
 
@@ skipping 734 matching lines @@
   // lose key window status.
   if ([NSApp isActive] && ([NSApp keyWindow] == window()))
     return;
 
   content::RenderWidgetHostView* rwhv =
       web_contents()->GetRenderWidgetHostView();
   if (rwhv)
     rwhv->SetActive(false);
 }
 
-void NativeAppWindowCocoa::WindowDidResize() {
+void NativeAppWindowCocoa::WindowDidFinishResize() {
   // Update |is_maximized_| if needed:
   // - Exit maximized state if resized.
   // - Consider us maximized if resize places us back to maximized location.
   //   This happens when returning from fullscreen.
   NSRect frame = [window() frame];
   NSRect screen = [[window() screen] visibleFrame];
   if (!NSEqualSizes(frame.size, screen.size))
     is_maximized_ = false;
   else if (NSEqualPoints(frame.origin, screen.origin))
     is_maximized_ = true;
 
+  // Update |is_fullscreen_| if needed.
+  is_fullscreen_ = ([window() styleMask] & NSFullScreenWindowMask) != 0;
+
   UpdateRestoredBounds();
+}
+
+void NativeAppWindowCocoa::WindowDidResize() {

[scheib, 2013/09/24 16:04:15]

Certain you don't need UpdaterestoredBounds() in this method?
OnNativeWindowChanged will attempt to save to geometry cache stale data
otherwise I think.

[jackhou1, 2013/09/24 21:34:25]

WindowDidResize is called repeatedly while a window is being resized or
animating. During that time, we want the restored_bounds_ to contain the bounds
of the window before the resize/animation started. Once the resize/animation is
finished, WindowDidFinishResize will update the new bounds. It should probably
call OnNativeWindowChanged as well, to ensure the new bounds are saved.

[tapted, 2013/09/24 23:23:14]

I got the impression from the Apple docs (i.e.
https://developer.apple.com/library/mac/documentation/cocoa/reference/Applica...
and
https://developer.apple.com/library/mac/documentation/cocoa/conceptual/CocoaP...
) that WindowDidFinishResize is guaranteed to be sent after a resize (since
10.1) - so the geometry data should always get a refresh once the size is
stable. I also got the impression that the size couldn't change between the last
WindowDidResize() and the WindowDidFinishResize(), so adding
OnNativeWindowChanged to WindowDidFinishResize might be redundant, and cause a
re-layout for some apps -- can you check the frame size never changes between
the last WindowDidResize and the WindowDidFinishResize?

However, one thing to check is whether WindowDidFinishResize is sent for
API-initiated resizes (i.e. non-user). A re-read of the wording in the
documentation suggests: "maybe" :/. But it would be pretty crap for Cocoa to
change this behaviour depending on the 'animate' argument to [NSWindow
setFrame:]

[jackhou1, 2013/09/30 01:46:33]

You're right, the frame size is the same.
 
Good catch, it does not call WindowDidFinishResize. The API-initiated resizes
use SetBounds, so added WindowDidFinishResize to that.

   shell_window_->OnNativeWindowChanged();
 }
 
 void NativeAppWindowCocoa::WindowDidMove() {
   UpdateRestoredBounds();
   shell_window_->OnNativeWindowChanged();
 }
 
 void NativeAppWindowCocoa::WindowDidMiniaturize() {
   shell_window_->OnNativeWindowChanged();
@@ skipping 63 matching lines @@
 ShellNSWindow* NativeAppWindowCocoa::window() const {
   NSWindow* window = [window_controller_ window];
   CHECK(!window || [window isKindOfClass:[ShellNSWindow class]]);
   return static_cast<ShellNSWindow*>(window);
 }
 
 void NativeAppWindowCocoa::UpdateRestoredBounds() {
   if (IsRestored(*this))
     restored_bounds_ = [window() frame];
 }