[Mac] Delay TabContents::Close() when event-tracking.

chrome/browser/tab_contents/tab_contents.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/tab_contents/tab_contents.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/file_version_info.h"
 #include "base/process_util.h"
@@ skipping 2161 matching lines @@
     }
   }
 }
 
 void TabContents::UpdateInspectorSettings(const std::string& raw_settings) {
   profile()->GetPrefs()->SetString(prefs::kWebKitInspectorSettings,
                                    UTF8ToWide(raw_settings));
 }
 
 void TabContents::Close(RenderViewHost* rvh) {
+  // The UI may be in an event-tracking loop, such as between the
+  // mouse-down and mouse-up in text selection or a button click.
+  // Defer the close until after tracking is complete, so that we
+  // don't free objects out from under the UI.
+  // TODO(shess): This could probably be integrated with the
+  // IsDoingDrag() test below.  Punting for now because I need more
+  // research to understand how this impacts platforms other than Mac.
+  // TODO(shess): This could get more fine-grained.  For instance,
+  // closing a tab in another window while selecting text in the
+  // current window's Omnibox should be just fine.
+  if (view()->IsEventTracking()) {
+    view()->CloseTabAfterEventTracking();
+    return;
+  }
+
   // If we close the tab while we're in the middle of a drag, we'll crash.
   // Instead, cancel the drag and close it as soon as the drag ends.
   if (view()->IsDoingDrag()) {
     view()->CancelDragAndCloseTab();
     return;
   }
 
   // Ignore this if it comes from a RenderViewHost that we aren't showing.
   if (delegate() && rvh == render_view_host())
     delegate()->CloseContents(this);
@@ skipping 452 matching lines @@
 #endif
 
     default:
       NOTREACHED();
   }
 }
 
 void TabContents::set_encoding(const std::string& encoding) {
   encoding_ = CharacterEncoding::GetCanonicalEncodingNameByAliasName(encoding);
 }