MacViews: Suppress visibility changes during an asynchronous close.

ui/views/widget/native_widget_mac.mm

 // Copyright 2014 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 "ui/views/widget/native_widget_mac.h"
 
 #import <Cocoa/Cocoa.h>
 
 #include <utility>
 
-#import "base/mac/bind_objc_block.h"
 #include "base/mac/foundation_util.h"
 #include "base/mac/scoped_nsobject.h"
 #include "base/strings/sys_string_conversions.h"
-#include "base/threading/thread_task_runner_handle.h"
-#import "ui/base/cocoa/constrained_window/constrained_window_animation.h"
 #import "ui/base/cocoa/window_size_constants.h"
 #include "ui/gfx/font_list.h"
 #import "ui/gfx/mac/coordinate_conversion.h"
 #import "ui/gfx/mac/nswindow_frame_controls.h"
 #include "ui/native_theme/native_theme.h"
 #include "ui/native_theme/native_theme_mac.h"
 #import "ui/views/cocoa/bridged_content_view.h"
 #import "ui/views/cocoa/bridged_native_widget.h"
 #include "ui/views/cocoa/cocoa_mouse_capture.h"
 #import "ui/views/cocoa/drag_drop_client_mac.h"
 #import "ui/views/cocoa/native_widget_mac_nswindow.h"
 #import "ui/views/cocoa/views_nswindow_delegate.h"
 #include "ui/views/widget/drop_helper.h"
 #include "ui/views/widget/widget_delegate.h"
 #include "ui/views/window/native_frame_view.h"
 
-// Self-owning animation delegate that starts a hide animation, then calls
-// -[NSWindow close] when the animation ends, releasing itself.
-@interface ViewsNSWindowCloseAnimator : NSObject<NSAnimationDelegate> {
- @private
-  base::scoped_nsobject<NSWindow> window_;
-  base::scoped_nsobject<NSAnimation> animation_;
-}
-
-+ (void)closeWindowWithAnimation:(NSWindow*)window;
-
-@end
-
 namespace views {
 namespace {
 
 NSInteger StyleMaskForParams(const Widget::InitParams& params) {
   // If the Widget is modal, it will be displayed as a sheet. This works best if
   // it has NSTitledWindowMask. For example, with NSBorderlessWindowMask, the
   // parent window still accepts input.
   if (params.delegate &&
       params.delegate->GetModalType() == ui::MODAL_TYPE_WINDOW)
     return NSTitledWindowMask;
@@ skipping 33 matching lines @@
     gfx::NativeWindow window) {
   id<NSWindowDelegate> window_delegate = [window delegate];
   if ([window_delegate respondsToSelector:@selector(nativeWidgetMac)]) {
     ViewsNSWindowDelegate* delegate =
         base::mac::ObjCCastStrict<ViewsNSWindowDelegate>(window_delegate);
     return [delegate nativeWidgetMac]->bridge_.get();
   }
   return nullptr;  // Not created by NativeWidgetMac.
 }
 
-bool NativeWidgetMac::IsWindowModalSheet() const {
-  return GetWidget()->widget_delegate()->GetModalType() ==
-         ui::MODAL_TYPE_WINDOW;
-}
-
 void NativeWidgetMac::OnWindowWillClose() {
   // Note: If closed via CloseNow(), |bridge_| will already be reset. If closed
   // by the user, or via Close() and a RunLoop, notify observers while |bridge_|
   // is still a valid pointer, then reset it.
   if (bridge_) {
     delegate_->OnNativeWidgetDestroying();
     bridge_.reset();
   }
   delegate_->OnNativeWidgetDestroyed();
   if (ownership_ == Widget::InitParams::NATIVE_WIDGET_OWNS_WIDGET)
@@ skipping 224 matching lines @@
 }
 
 void NativeWidgetMac::SetShape(std::unique_ptr<SkRegion> shape) {
   NOTIMPLEMENTED();
 }
 
 void NativeWidgetMac::Close() {
   if (!bridge_)
     return;
 
-  NSWindow* window = GetNativeWindow();
-  if (IsWindowModalSheet()) {
-    // Sheets can't be closed normally. This starts the sheet closing. Once the
-    // sheet has finished animating, it will call sheetDidEnd: on the parent
-    // window's delegate. Note it still needs to be asynchronous, since code
-    // calling Widget::Close() doesn't expect things to be deleted upon return.
-    [NSApp performSelector:@selector(endSheet:) withObject:window afterDelay:0];
-    return;
-  }
-
-  // For other modal types, animate the close.
-  if (delegate_->IsModal()) {
-    [ViewsNSWindowCloseAnimator closeWindowWithAnimation:window];
-    return;
-  }
-
-  // Clear the view early to suppress repaints.
-  bridge_->SetRootView(NULL);
-
-  // Widget::Close() ensures [Non]ClientView::CanClose() returns true, so there
-  // is no need to call the NSWindow or its delegate's -windowShouldClose:
-  // implementation in the manner of -[NSWindow performClose:]. But,
-  // like -performClose:, first remove the window from AppKit's display
-  // list to avoid crashes like http://crbug.com/156101.
-  [window orderOut:nil];
-
-  // Many tests assume that base::RunLoop().RunUntilIdle() is always sufficient
-  // to execute a close. However, in rare cases, -performSelector:..afterDelay:0
-  // does not do this. So post a regular task.
-  base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, base::BindBlock(^{
-    [window close];
-  }));
+  bridge_->CloseAsynchronously();
 }
 
 void NativeWidgetMac::CloseNow() {
   if (!bridge_)
     return;
 
   // Notify observers while |bridged_| is still valid.
   delegate_->OnNativeWidgetDestroying();
   // Reset |bridge_| to NULL before destroying it.
   std::unique_ptr<BridgedNativeWidget> bridge(std::move(bridge_));
@@ skipping 347 matching lines @@
 }
 
 // static
 gfx::NativeView NativeWidgetPrivate::GetGlobalCapture(
     gfx::NativeView native_view) {
   return [CocoaMouseCapture::GetGlobalCaptureWindow() contentView];
 }
 
 }  // namespace internal
 }  // namespace views
-
-@implementation ViewsNSWindowCloseAnimator
-
-- (id)initWithWindow:(NSWindow*)window {
-  if ((self = [super init])) {
-    window_.reset([window retain]);
-    animation_.reset(
-        [[ConstrainedWindowAnimationHide alloc] initWithWindow:window]);
-    [animation_ setDelegate:self];
-    [animation_ setAnimationBlockingMode:NSAnimationNonblocking];
-    [animation_ startAnimation];
-  }
-  return self;
-}
-
-+ (void)closeWindowWithAnimation:(NSWindow*)window {
-  [[ViewsNSWindowCloseAnimator alloc] initWithWindow:window];
-}
-
-- (void)animationDidEnd:(NSAnimation*)animation {
-  [window_ close];
-  [animation_ setDelegate:nil];
-  [self release];
-}
-
-@end