[rAC, OSX] Stop suggestions/inputs from flickering

chrome/browser/ui/cocoa/autofill/autofill_section_container.mm

 // Copyright (c) 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_section_container.h"
 
 #include <algorithm>
 
 #include "base/mac/foundation_util.h"
 #include "base/strings/sys_string_conversions.h"
@@ skipping 195 matching lines @@
 
   [self modelChanged];
 }
 
 - (NSSize)preferredSize {
   if ([view_ isHidden])
     return NSZeroSize;
 
   NSSize labelSize = [label_ frame].size;  // Assumes sizeToFit was called.
   CGFloat controlHeight = [inputs_ preferredHeightForWidth:kDetailsWidth];
-  if ([inputs_ isHidden])
+  if (showSuggestions_)
     controlHeight = [suggestContainer_ preferredSize].height;
 
   return NSMakeSize(kDetailsWidth,
                     labelSize.height + kVerticalHeaderPadding +
                         controlHeight + 2 * kDetailSectionInset);
 }
 
 - (void)performLayout {
   if ([view_ isHidden])
     return;
 
   NSSize buttonSize = [suggestButton_ frame].size;  // Assume sizeToFit.
   NSSize labelSize = [label_ frame].size;  // Assumes sizeToFit was called.
   CGFloat controlHeight = [inputs_ preferredHeightForWidth:kDetailsWidth];
-  if ([inputs_ isHidden])
+  if (showSuggestions_)
     controlHeight = [suggestContainer_ preferredSize].height;
 
   NSRect viewFrame = NSZeroRect;
   viewFrame.size = [self preferredSize];
 
   NSRect contentFrame = NSInsetRect(viewFrame, 0, kDetailSectionInset);
   NSRect controlFrame, labelFrame, buttonFrame;
 
   // Label is top left, suggestion button is top right, controls are below that.
   NSDivideRect(contentFrame, &labelFrame, &controlFrame,
                kVerticalHeaderPadding + labelSize.height, NSMaxYEdge);
   NSDivideRect(labelFrame, &buttonFrame, &labelFrame,
                buttonSize.width, NSMaxXEdge);
 
   labelFrame = NSOffsetRect(labelFrame, 0, kVerticalHeaderPadding);
   labelFrame.size = labelSize;
 
   buttonFrame = NSOffsetRect(buttonFrame, 0, 5);
   buttonFrame.size = buttonSize;
 
-  if ([inputs_ isHidden]) {
+  if (showSuggestions_) {
     [[suggestContainer_ view] setFrame:controlFrame];
     [suggestContainer_ performLayout];
   } else {
     [inputs_ setFrame:controlFrame];
   }
   [label_ setFrame:labelFrame];
   [suggestButton_ setFrame:buttonFrame];
+  [inputs_ setHidden:showSuggestions_];
+  [[suggestContainer_ view] setHidden:!showSuggestions_];
   [view_ setFrameSize:viewFrame.size];
 }
 
 - (void)fieldBecameFirstResponder:(NSControl<AutofillInputField>*)field {
   [self textfieldEditedOrActivated:field edited:NO];
   [validationDelegate_ updateMessageForField:field];
 }
 
 - (void)didChange:(id)sender {
   [self textfieldEditedOrActivated:sender edited:YES];
 }
 
 - (void)didEndEditing:(id)sender {
   [self validateFor:autofill::VALIDATE_EDIT];
 }
 
 - (void)updateSuggestionState {
   const autofill::SuggestionState& suggestionState =
       delegate_->SuggestionStateForSection(section_);
   // TODO(estade): use |vertically_compact_text| when it fits.
   const base::string16& text = suggestionState.horizontally_compact_text;
-  bool showSuggestions = suggestionState.visible;
-
-  [[suggestContainer_ view] setHidden:!showSuggestions];
-  [inputs_ setHidden:showSuggestions];
+  showSuggestions_ = suggestionState.visible;
 
   base::string16 line1;
   base::string16 line2;
   BreakSuggestionText(text, &line1, &line2);
   [suggestContainer_ setSuggestionText:base::SysUTF16ToNSString(line1)
                                  line2:base::SysUTF16ToNSString(line2)];
   [suggestContainer_ setIcon:suggestionState.icon.AsNSImage()];
   if (!suggestionState.extra_text.empty()) {
     NSString* extraText =
         base::SysUTF16ToNSString(suggestionState.extra_text);
     NSImage* extraIcon = suggestionState.extra_icon.AsNSImage();
     [suggestContainer_ showInputField:extraText withIcon:extraIcon];
   }
-  [view_ setShouldHighlightOnHover:showSuggestions];
-  if (showSuggestions)
+  [view_ setShouldHighlightOnHover:showSuggestions_];
+  if (showSuggestions_)
     [view_ setClickTarget:suggestButton_];
   else
     [view_ setClickTarget:nil];
   [view_ setHidden:!delegate_->SectionIsActive(section_)];
 }
 
 - (void)update {
   [self updateAndClobber:YES];
 }
 
@@ skipping 18 matching lines @@
           [popup selectItemAtIndex:model->GetDefaultIndex()];
         }
       }
     }
   }
 
   [self updateAndClobber:NO];
 }
 
 - (BOOL)validateFor:(autofill::ValidationType)validationType {
-  DCHECK(![[self view] isHidden]);
-
   NSArray* fields = nil;
   if (![inputs_ isHidden]) {
     fields = [inputs_ subviews];
   } else if (section_ == autofill::SECTION_CC) {
     fields = @[[suggestContainer_ inputField]];
   }
 
   autofill::DetailOutputMap detailOutputs;
   [self fillDetailOutputs:&detailOutputs fromControls:fields];
   autofill::ValidityMessages messages = delegate_->InputsAreValid(
@@ skipping 267 matching lines @@
 
 - (void)activateFieldForInput:(const autofill::DetailInput&)input {
   if ([self detailInputForType:input.type] != &input)
     return;
 
   NSControl<AutofillInputField>* field = [inputs_ viewWithTag:input.type];
   [[field window] makeFirstResponder:field];
 }
 
 @end