Merge 198829 "Changes the order of widget Close() and DecrementD..."

ui/message_center/views/toast_contents_view.cc

 // 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.
 
 #include "ui/message_center/views/toast_contents_view.h"
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
@@ skipping 196 matching lines @@
       collection_->IncrementDeferCounter();
   fade_animation_->Stop();
 
   closing_animation_ = (is_closing_ ? fade_animation_.get() : NULL);
   fade_animation_->Reset(1);
   fade_animation_->Hide();
 }
 
 void ToastContentsView::OnBoundsAnimationEndedOrCancelled(
     const ui::Animation* animation) {
+  if (is_closing_ && closing_animation_ == animation && GetWidget())
+    GetWidget()->Close();
+
+  // This cannot be called before GetWidget()->Close(). Decrementing defer count
+  // will invoke update, which may invoke another close animation with
+  // incrementing defer counter. Close() after such process will cause a
+  // mismatch between increment/decrement. See crbug.com/238477
   if (collection_)
     collection_->DecrementDeferCounter();
-
-  if (is_closing_ && closing_animation_ == animation && GetWidget())
-    GetWidget()->Close();
 }
 
 // ui::AnimationDelegate
 void ToastContentsView::AnimationProgressed(const ui::Animation* animation) {
   if (animation == bounds_animation_.get()) {
     gfx::Rect current(animation->CurrentValueBetween(
         animated_bounds_start_, animated_bounds_end_));
     GetWidget()->SetBounds(current);
   } else if (animation == fade_animation_.get()) {
     unsigned char opacity =
@@ skipping 53 matching lines @@
 }
 
 gfx::Rect ToastContentsView::GetClosedToastBounds(gfx::Rect bounds) {
   return gfx::Rect(bounds.x() + bounds.width() - kClosedToastWidth,
                    bounds.y(),
                    kClosedToastWidth,
                    bounds.height());
 }
 
 }  // namespace message_center