Merge crash fix to 3.0....

chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc

 // Copyright (c) 2009 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/views/autocomplete/autocomplete_popup_contents_view.h"
 
 #include <objidl.h>
 #include <commctrl.h>
 #include <dwmapi.h>
 
@@ skipping 663 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // AutocompletePopupContentsView, public:
 
 AutocompletePopupContentsView::AutocompletePopupContentsView(
     const gfx::Font& font,
     AutocompleteEditViewWin* edit_view,
     AutocompleteEditModel* edit_model,
     Profile* profile,
     AutocompletePopupPositioner* popup_positioner)
-    : popup_(new AutocompletePopupWin(this)),
-      model_(new AutocompletePopupModel(this, edit_model, profile)),
+    : model_(new AutocompletePopupModel(this, edit_model, profile)),
       edit_view_(edit_view),
       popup_positioner_(popup_positioner),
       result_font_(font.DeriveFont(kEditFontAdjust)),
       ALLOW_THIS_IN_INITIALIZER_LIST(size_animation_(this)) {
   set_border(new PopupBorder);
 }
 
 gfx::Rect AutocompletePopupContentsView::GetPopupBounds() const {
   if (!size_animation_.IsAnimating())
     return target_bounds_;
 
   gfx::Rect current_frame_bounds = start_bounds_;
   int total_height_delta = target_bounds_.height() - start_bounds_.height();
   // Round |current_height_delta| instead of truncating so we won't leave single
   // white pixels at the bottom of the popup as long when animating very small
   // height differences.
   int current_height_delta = static_cast<int>(
       size_animation_.GetCurrentValue() * total_height_delta - 0.5);
   current_frame_bounds.set_height(
       current_frame_bounds.height() + current_height_delta);
   return current_frame_bounds;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // AutocompletePopupContentsView, AutocompletePopupView overrides:
 
 bool AutocompletePopupContentsView::IsOpen() const {
-  return popup_->IsWindow() && popup_->IsVisible();
+  return (popup_ != NULL);
 }
 
 void AutocompletePopupContentsView::InvalidateLine(size_t line) {
   GetChildViewAt(static_cast<int>(line))->SchedulePaint();
 }
 
 void AutocompletePopupContentsView::UpdatePopupAppearance() {
   if (model_->result().empty()) {
     // No matches, close any existing popup.
-    if (popup_->IsWindow()) {
+    if (popup_ != NULL) {
       size_animation_.Stop();
-      popup_->Hide();
+      popup_->CloseNow();
+      popup_.reset();
     }
     return;
   }
 
   // Update the match cached by each row, in the process of doing so make sure
   // we have enough row views.
   int total_child_height = 0;
   size_t child_view_count = GetChildViewCount();
   for (size_t i = 0; i < model_->result().size(); ++i) {
     AutocompleteResultView* result_view;
@@ skipping 16 matching lines @@
                           -insets.bottom());
 
   // If we're animating and our target height changes, reset the animation.
   // NOTE: If we just reset blindly on _every_ update, then when the user types
   // rapidly we could get "stuck" trying repeatedly to animate shrinking by the
   // last few pixels to get to one visible result.
   if (new_target_bounds.height() != target_bounds_.height())
     size_animation_.Reset();
   target_bounds_ = new_target_bounds;
 
-  if (!popup_->IsWindow()) {
-    // If we've never been shown, we need to create the window.
-    popup_->Init(edit_view_, this);
+  if (popup_ == NULL) {
+    // If the popup is currently closed, we need to create it.
+    popup_.reset(new AutocompletePopupClass(edit_view_, this));
   } else {
-    // Animate the popup shrinking, but don't animate growing larger (or
-    // appearing for the first time) since that would make the popup feel less
-    // responsive.
+    // Animate the popup shrinking, but don't animate growing larger since that
+    // would make the popup feel less responsive.
     GetWidget()->GetBounds(&start_bounds_, true);
-    if (popup_->IsVisible() &&
-        (target_bounds_.height() < start_bounds_.height()))
+    if (target_bounds_.height() < start_bounds_.height())
       size_animation_.Show();
     else
       start_bounds_ = target_bounds_;
-    popup_->Show();
+    popup_->SetBounds(GetPopupBounds());
   }
 
   SchedulePaint();
 }
 
 void AutocompletePopupContentsView::OnHoverEnabledOrDisabled(bool disabled) {
   // TODO(beng): remove this from the interface.
 }
 
 void AutocompletePopupContentsView::PaintUpdatesNow() {
@@ skipping 37 matching lines @@
                                                     bool revert_to_default) {
   if (HasMatchAt(index))
     model_->SetSelectedLine(index, revert_to_default);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // AutocompletePopupContentsView, AnimationDelegate implementation:
 
 void AutocompletePopupContentsView::AnimationProgressed(
     const Animation* animation) {
-  popup_->Show();
+  // We should only be running the animation when the popup is already visible.
+  DCHECK(popup_ != NULL);
+  popup_->SetBounds(GetPopupBounds());
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // AutocompletePopupContentsView, views::View overrides:
 
 void AutocompletePopupContentsView::Paint(gfx::Canvas* canvas) {
   // We paint our children in an unconventional way.
   //
   // Because the border of this view creates an anti-aliased round-rect region
   // for the contents, we need to render our rectangular result child views into
@@ skipping 104 matching lines @@
 }
 
 void AutocompletePopupContentsView::MakeCanvasTransparent(
     gfx::Canvas* canvas) {
   // Allow the window blur effect to show through the popup background.
   SkAlpha alpha = GetThemeProvider()->ShouldUseNativeFrame() ?
       kGlassPopupAlpha : kOpaquePopupAlpha;
   canvas->drawColor(SkColorSetA(GetColor(NORMAL, BACKGROUND), alpha),
                     SkXfermode::kDstIn_Mode);
 }