[Mac] Fixes janky animations in the omnibox popup....

chrome/browser/autocomplete/autocomplete_popup_view_mac.mm

 // Copyright (c) 2010 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/autocomplete/autocomplete_popup_view_mac.h"
 
 #include "app/resource_bundle.h"
 #include "app/text_elider.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete_edit.h"
@@ skipping 26 matching lines @@
 // autocomplete_popup_contents_view.cc, kGlassPopupTransparency).
 const CGFloat kPopupAlpha = 240.0 / 255.0;
 
 // How much space to leave for the left and right margins.
 const CGFloat kLeftRightMargin = 5.0;
 
 // How far to offset the text column from the left.
 const CGFloat kTextXOffset = 29.0;
 
 // Animation duration when animating the popup window smaller.
-const CGFloat kShrinkAnimationDuration = 0.1;
+const NSTimeInterval kShrinkAnimationDuration = 0.1;
+
+// A very short animation duration used to cancel running animations.
+const NSTimeInterval kCancelAnimationDuration = 0.00001;
 
 // Maximum fraction of the popup width that can be used to display match
 // contents.
 const float kMaxContentsFraction = 0.7;
 
 // NSEvent -buttonNumber for middle mouse button.
 const static NSInteger kMiddleButtonNumber(2);
 
 // Background colors for different states of the popup elements.
 NSColor* BackgroundColor() {
@@ skipping 231 matching lines @@
     [popup_ setBackgroundColor:[NSColor clearColor]];
     [popup_ setHasShadow:YES];
     [popup_ setLevel:NSNormalWindowLevel];
 
     scoped_nsobject<AutocompleteMatrix> matrix(
         [[AutocompleteMatrix alloc] initWithPopupView:this]);
     [popup_ setContentView:matrix];
   }
 }
 
+void AutocompletePopupViewMac::SetPopupFrame(const NSRect frame) {
+  // Do nothing if the popup is already animating to the given |frame|.
+  if  (NSEqualRects(frame, targetPopupFrame_))
+    return;
+
+  NSRect currentPopupFrame = [popup_ frame];
+  targetPopupFrame_ = frame;
+
+  // Animate the frame change if the only change is that the height got smaller.
+  // Otherwise, resize immediately.
+  bool animate = (NSHeight(frame) < NSHeight(currentPopupFrame) &&
+                  NSWidth(frame) == NSWidth(currentPopupFrame));
+  NSTimeInterval duration =
+      (animate ? kShrinkAnimationDuration: kCancelAnimationDuration);
+
+  [NSAnimationContext beginGrouping];
+  // Don't use the GTM additon for the "Steve" slowdown because this can happen
+  // async from user actions and the effects could be a surprise.
+  [[NSAnimationContext currentContext] setDuration:duration];
+  [[popup_ animator] setFrame:frame display:YES];
+  [NSAnimationContext endGrouping];
+}
+
 void AutocompletePopupViewMac::UpdatePopupAppearance() {
   DCHECK([NSThread isMainThread]);
   const AutocompleteResult& result = model_->result();
   if (result.empty()) {
     [[popup_ parentWindow] removeChildWindow:popup_];
     [popup_ orderOut:nil];
 
     // Break references to matrix_target_ before releasing popup_.
     NSMatrix* matrix = [popup_ contentView];
     [matrix setTarget:nil];
@@ skipping 38 matching lines @@
   }
 
   // Set the cell size to fit a line of text in the cell's font.  All
   // cells should use the same font and each should layout in one
   // line, so they should all be about the same height.
   const NSSize cellSize = [[matrix cellAtRow:0 column:0] cellSize];
   DCHECK_GT(cellSize.height, 0.0);
   [matrix setCellSize:NSMakeSize(r.size.width,
                                  cellSize.height + kCellHeightAdjust)];
 
+  // Save the old matrix frame in order to later restore it.
+  NSRect savedMatrixFrame = [matrix frame];
+
   // Make the matrix big enough to hold all the cells.
   [matrix sizeToCells];
 
   // Make the window just as big.
   r.size.height = [matrix frame].size.height;
   r.origin.y -= r.size.height + kPopupFieldGap;
 
+  // Resize the matrix back to its original size, since we aren't resizing the
+  // window immediately.
+  [matrix setFrame:savedMatrixFrame];
+
   // Update the selection.
   PaintUpdatesNow();
 
-  // Animate the frame change if the only change is that the height got smaller.
-  // Otherwise, resize immediately.
-  NSRect oldFrame = [popup_ frame];
-  if (r.size.height < oldFrame.size.height &&
-      r.origin.x == oldFrame.origin.x &&
-      r.size.width == oldFrame.size.width) {
-    [NSAnimationContext beginGrouping];
-    // Don't use the GTM additon for the "Steve" slowdown because this can
-    // happen async from user actions and the effects could be a surprise.
-   [[NSAnimationContext currentContext] setDuration:kShrinkAnimationDuration];
-    [[popup_ animator] setFrame:r display:YES];
-    [NSAnimationContext endGrouping];
-  } else {
-    [popup_ setFrame:r display:YES];
-  }
+  SetPopupFrame(r);
 
   if (!IsOpen()) {
     [[field_ window] addChildWindow:popup_ ordered:NSWindowAbove];
   }
 }
 
 // This is only called by model in SetSelectedLine() after updating
 // everything.  Popup should already be visible.
 void AutocompletePopupViewMac::PaintUpdatesNow() {
   AutocompleteMatrix* matrix = [popup_ contentView];
@@ skipping 85 matching lines @@
     titleRect.size.width -= (kTextXOffset + kLeftRightMargin);
     titleRect.origin.x += kTextXOffset;
     [self drawTitle:title withFrame:titleRect inView:controlView];
   }
 }
 
 @end
 
 @implementation AutocompleteMatrix
 
+
+
 // Remove all tracking areas and initialize the one we want.  Removing
 // all might be overkill, but it's unclear why there would be others
 // for the popup window.
 - (void)resetTrackingArea {
   for (NSTrackingArea* trackingArea in [self trackingAreas]) {
     [self removeTrackingArea:trackingArea];
   }
 
   // TODO(shess): Consider overriding -acceptsFirstMouse: and changing
   // NSTrackingActiveInActiveApp to NSTrackingActiveAlways.
@@ skipping 178 matching lines @@
                        bottomRightCornerRadius:0.0];
 
   // Draw the matrix clipped to our border.
   [NSGraphicsContext saveGraphicsState];
   [path addClip];
   [super drawRect:rect];
   [NSGraphicsContext restoreGraphicsState];
 }
 
 @end