(Mac) Make mashing the close tab button work.

chrome/browser/cocoa/tab_view.mm

 // 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/cocoa/tab_view.h"
+
 #include "chrome/browser/cocoa/nsimage_cache.h"
 #include "chrome/browser/cocoa/tab_controller.h"
-#include "chrome/browser/cocoa/tab_view.h"
 #include "chrome/browser/cocoa/tab_window_controller.h"
 
-
 // Constants for inset and control points for tab shape.
 static const CGFloat kInsetMultiplier = 2.0/3.0;
 static const CGFloat kControlPoint1Multiplier = 1.0/3.0;
 static const CGFloat kControlPoint2Multiplier = 3.0/8.0;
 
 static const NSTimeInterval kAnimationShowDuration = 0.2;
 static const NSTimeInterval kAnimationHideDuration = 0.4;
 
 @implementation TabView
 
@@ skipping 122 matching lines @@
 }
 
 // Handle clicks and drags in this button. We get here because we have
 // overridden acceptsFirstMouse: and the click is within our bounds.
 // TODO(pinkerton/alcor): This routine needs *a lot* of work to marry Cole's
 // ideas of dragging cocoa views between windows and how the Browser and
 // TabStrip models want to manage tabs.
 
 static const CGFloat kTearDistance = 36.0;
 static const NSTimeInterval kTearDuration = 0.333;
-static const double kDragStartDistance = 3.0;
+
+// This is used to judge whether the mouse has moved during rapid closure; if it
+// has moved less than the threshold, we want to close the tab.
+static const CGFloat kRapidCloseDist = 2.5;
 
 - (void)mouseDown:(NSEvent *)theEvent {
+  NSPoint downLocation = [theEvent locationInWindow];
+
+  // During the tab closure animation (in particular, during rapid tab closure),
+  // we may get incorrectly hit with a mouse down. If it should have gone to the
+  // close button, we send it there -- it should then track the mouse, so we
+  // don't have to worry about mouse ups.
+  if ([controller_ inRapidClosureMode]) {
+    NSPoint hitLocation = [[self superview] convertPoint:downLocation
+                                                fromView:nil];
+    if ([self hitTest:hitLocation] == closeButton_) {
+      [closeButton_ mouseDown:theEvent];
+      return;
+    }
+  }
+
   // Fire the action to select the tab.
   if ([[controller_ target] respondsToSelector:[controller_ action]])
     [[controller_ target] performSelector:[controller_ action]
                                withObject:self];
 
   // Resolve overlay back to original window.
   sourceWindow_ = [self window];
   if ([sourceWindow_ isKindOfClass:[NSPanel class]]) {
     sourceWindow_ = [sourceWindow_ parentWindow];
   }
@@ skipping 25 matching lines @@
     theEvent =
     [NSApp nextEventMatchingMask:NSLeftMouseUpMask | NSLeftMouseDraggedMask
                        untilDate:[NSDate distantFuture]
                           inMode:NSDefaultRunLoopMode dequeue:YES];
     NSPoint thisPoint = [NSEvent mouseLocation];
 
     NSEventType type = [theEvent type];
     if (type == NSLeftMouseDragged) {
       [self mouseDragged:theEvent];
     } else { // Mouse Up
+      NSPoint upLocation = [theEvent locationInWindow];
+      CGFloat dx = upLocation.x - downLocation.x;
+      CGFloat dy = upLocation.y - downLocation.y;
+
+      // During rapid tab closure (mashing tab close buttons), we may get hit
+      // with a mouse down. As long as the mouse up is over the close button,
+      // and the mouse hasn't moved too much, we close the tab.
+      if ((dx*dx + dy*dy) <= kRapidCloseDist*kRapidCloseDist &&
+          [controller_ inRapidClosureMode]) {
+        NSPoint hitLocation =
+            [[self superview] convertPoint:[theEvent locationInWindow]
+                                  fromView:nil];
+        if ([self hitTest:hitLocation] == closeButton_) {
+          [controller_ closeTab:self];
+          break;
+        }
+      }
+
       [self mouseUp:theEvent];
       break;
     }
   }
 }
 
 - (void)mouseDragged:(NSEvent *)theEvent {
   // Special-case this to keep the logic below simpler.
   if (moveWindowOnDrag_) {
     NSPoint thisPoint = [NSEvent mouseLocation];
@@ skipping 402 matching lines @@
   [[NSGraphicsContext currentContext] restoreGraphicsState];
 }
 
 // Called when the user hits the right mouse button (or control-clicks) to
 // show a context menu.
 - (void)rightMouseDown:(NSEvent*)theEvent {
   [NSMenu popUpContextMenu:[self menu] withEvent:theEvent forView:self];
 }
 
 @end