[rAC, OSX] Fix dialog jankiness.

chrome/browser/ui/cocoa/autofill/autofill_dialog_window_controller.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.
 
 #import "chrome/browser/ui/cocoa/autofill/autofill_dialog_window_controller.h"
 
 #include "base/mac/foundation_util.h"
 #include "base/mac/scoped_nsobject.h"
 #include "base/strings/sys_string_conversions.h"
 #include "chrome/browser/ui/autofill/autofill_dialog_view_delegate.h"
 #include "chrome/browser/ui/cocoa/autofill/autofill_dialog_cocoa.h"
 #include "chrome/browser/ui/cocoa/autofill/autofill_dialog_constants.h"
 #import "chrome/browser/ui/cocoa/autofill/autofill_header.h"
 #import "chrome/browser/ui/cocoa/autofill/autofill_input_field.h"
 #import "chrome/browser/ui/cocoa/autofill/autofill_loading_shield_controller.h"
 #import "chrome/browser/ui/cocoa/autofill/autofill_main_container.h"
 #import "chrome/browser/ui/cocoa/autofill/autofill_overlay_controller.h"
 #import "chrome/browser/ui/cocoa/autofill/autofill_section_container.h"
 #import "chrome/browser/ui/cocoa/autofill/autofill_sign_in_container.h"
 #import "chrome/browser/ui/cocoa/autofill/autofill_textfield.h"
 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_custom_window.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
 #include "grit/generated_resources.h"
 #import "ui/base/cocoa/flipped_view.h"
 #include "ui/base/cocoa/window_size_constants.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace {

[Nico, 2013/11/27 01:03:06]

const has implicit internal linkage, empty namespace not needed

[groby-ooo-7-16, 2013/11/27 01:34:04]

Done.

 
 const CGFloat kMinimumContentsHeight = 101;
 
 }  // namespace
 
+#pragma mark AutofillDialogWindow
+
+// Window class for the AutofillDialog. Its main purpose is the proper handling
+// of layout requests - i.e. ensuring that layout is fully done before any
+// updates of the display happen.
+@interface AutofillDialogWindow : ConstrainedWindowCustomWindow {
+ @private
+  BOOL needsLayout;  // Indicates that the subviews need to be laid out.

[Nico, 2013/11/27 01:03:06]

don't we name instance variables with a trailing _?

[groby-ooo-7-16, 2013/11/27 01:34:04]

Yes, we do. My brain is already eating turkey, it seems.
Done.

+}
+
+// Request a new layout for all subviews. Layout occurs right before -display
+// or -displayIfNeeded are invoked.
+- (void)requestRelayout;
+
+// Layout the window's subviews. Delegates to the controller.
+- (void)performLayout;
+
+@end
+
+
+@implementation AutofillDialogWindow
+
+- (void)requestRelayout {
+  needsLayout = YES;
+}
+
+- (void)performLayout {
+  if (needsLayout) {
+    needsLayout = NO;
+    AutofillDialogWindowController* controller =
+        base::mac::ObjCCastStrict<AutofillDialogWindowController>(
+            [self windowController]);
+    [controller performLayout];
+  }
+}
+
+- (void)display {
+  [self performLayout];
+  [super display];
+}
+
+- (void)displayIfNeeded {
+  [self performLayout];
+  [super displayIfNeeded];
+}
+
+@end
+
 #pragma mark Field Editor
 
 @interface AutofillDialogFieldEditor : NSTextView
 @end
 
 
 @implementation AutofillDialogFieldEditor
 
 - (void)mouseDown:(NSEvent*)event {
   // Delegate _must_ be notified before mouseDown is complete, since it needs
@@ skipping 29 matching lines @@
 
 // Update size constraints on sign-in container.
 - (void)updateSignInSizeConstraints;
 
 // Notification that the WebContent's view frame has changed.
 - (void)onContentViewFrameDidChange:(NSNotification*)notification;
 
 // Update whether or not the main container is hidden.
 - (void)updateMainContainerVisibility;
 
+- (AutofillDialogWindow*)autofillWindow;
+
 @end
 
 
 @implementation AutofillDialogWindowController (NSWindowDelegate)
 
 - (id)windowWillReturnFieldEditor:(NSWindow*)window toObject:(id)client {
   AutofillTextField* textfield = base::mac::ObjCCast<AutofillTextField>(client);
   if (!textfield)
     return nil;
 
   if (!fieldEditor_) {
     fieldEditor_.reset([[AutofillDialogFieldEditor alloc] init]);
     [fieldEditor_ setFieldEditor:YES];
   }
   return fieldEditor_.get();
 }
 
 @end
 
 
 @implementation AutofillDialogWindowController
 
 - (id)initWithWebContents:(content::WebContents*)webContents
                    dialog:(autofill::AutofillDialogCocoa*)dialog {
   DCHECK(webContents);
 
   base::scoped_nsobject<ConstrainedWindowCustomWindow> window(
-      [[ConstrainedWindowCustomWindow alloc]
+      [[AutofillDialogWindow alloc]
           initWithContentRect:ui::kWindowSizeDeterminedLater]);
 
   if ((self = [super initWithWindow:window])) {
     [window setDelegate:self];
     webContents_ = webContents;
     dialog_ = dialog;
 
     header_.reset([[AutofillHeader alloc] initWithDelegate:dialog->delegate()]);
 
     mainContainer_.reset([[AutofillMainContainer alloc]
@@ skipping 67 matching lines @@
 }
 
 - (void)updateMainContainerVisibility {
   BOOL visible =
       [[loadingShieldController_ view] isHidden] &&
       [[overlayController_ view] isHidden] &&
       [[signInContainer_ view] isHidden];
   [[mainContainer_ view] setHidden:!visible];
 }
 
-- (void)cancelRelayout {
-  [NSObject cancelPreviousPerformRequestsWithTarget:self
-                                           selector:@selector(performLayout)
-                                             object:nil];
+- (AutofillDialogWindow*)autofillWindow {
+  return base::mac::ObjCCastStrict<AutofillDialogWindow>([self window]);
 }
 
 - (void)requestRelayout {
-  [self cancelRelayout];
-  [self performSelector:@selector(performLayout) withObject:nil afterDelay:0.0];
+  [[self autofillWindow] requestRelayout];
 }
 
 - (NSSize)preferredSize {
   NSSize size;
 
   if (![[overlayController_ view] isHidden]) {
     size.height = [overlayController_ heightForWidth:size.width];
   } else {
     // Overall size is determined by either main container or sign in view.
     if ([[signInContainer_ view] isHidden])
@@ skipping 183 matching lines @@
 
 - (content::WebContents*)getSignInWebContents {
   return [signInContainer_ webContents];
 }
 
 - (BOOL)isShowingOverlay {
   return ![[overlayController_ view] isHidden];
 }
 
 @end