Mac/clang: Uncontentious fixes.

chrome/browser/cocoa/tab_view.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.
 
 #import "chrome/browser/cocoa/tab_view.h"
 
 #include "base/logging.h"
 #include "base/nsimage_cache_mac.h"
 #include "chrome/browser/browser_theme_provider.h"
 #import "chrome/browser/cocoa/tab_controller.h"
@@ skipping 266 matching lines @@
   // controller.
   scoped_nsobject<TabController> controller([controller_ retain]);
 
   // Because we move views between windows, we need to handle the event loop
   // ourselves. Ideally we should use the standard event loop.
   while (1) {
     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 if (type == NSLeftMouseUp) {
       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,
@@ skipping 33 matching lines @@
       [sourceWindow_ setFrameOrigin:NSMakePoint(origin.x, origin.y)];
     }  // else do nothing.
     return;
   }
 
   // First, go through the magnetic drag cycle. We break out of this if
   // "stretchiness" ever exceeds a set amount.
   tabWasDragged_ = YES;
 
   if (draggingWithinTabStrip_) {
-    NSRect frame = [self frame];
     NSPoint thisPoint = [NSEvent mouseLocation];
     CGFloat stretchiness = thisPoint.y - dragOrigin_.y;
     stretchiness = copysign(sqrtf(fabs(stretchiness))/sqrtf(kTearDistance),
                             stretchiness) / 2.0;
     CGFloat offset = thisPoint.x - dragOrigin_.x;
     if (fabsf(offset) > 100) stretchiness = 0;
     [sourceController_ insertPlaceholderForTab:self
                                          frame:NSOffsetRect(sourceTabFrame_,
                                                             offset, 0)
                                  yStretchiness:stretchiness];
     // Check that we haven't pulled the tab too far to start a drag. This
     // can include either pulling it too far down, or off the side of the tab
     // strip that would cause it to no longer be fully visible.
     BOOL stillVisible = [sourceController_ isTabFullyVisible:self];
     CGFloat tearForce = fabs(thisPoint.y - dragOrigin_.y);
     if ([sourceController_ tabTearingAllowed] &&
         (tearForce > kTearDistance || !stillVisible)) {
       draggingWithinTabStrip_ = NO;
       // When you finally leave the strip, we treat that as the origin.
       dragOrigin_.x = thisPoint.x;
     } else {
       // Still dragging within the tab strip, wait for the next drag event.
       return;
     }
   }
 
-  NSPoint lastPoint =
-    [[theEvent window] convertBaseToScreen:[theEvent locationInWindow]];
-
   // Do not start dragging until the user has "torn" the tab off by
   // moving more than 3 pixels.
   NSDate* targetDwellDate = nil;  // The date this target was first chosen.
 
   NSPoint thisPoint = [NSEvent mouseLocation];
 
   // Iterate over possible targets checking for the one the mouse is in.
   // If the tab is just in the frame, bring the window forward to make it
   // easier to drop something there. If it's in the tab strip, set the new
   // target so that it pops into that window. We can't cache this because we
@@ skipping 113 matching lines @@
   // a placeholder so it appears like it's part of that window.
   if (targetController_) {
     if (![[targetController_ window] isKeyWindow]) {
       // && ([targetDwellDate timeIntervalSinceNow] < -REQUIRED_DWELL)) {
       [[targetController_ window] orderFront:nil];
       targetDwellDate = nil;
     }
 
     // Compute where placeholder should go and insert it into the
     // destination tab strip.
-    NSRect dropTabFrame = [[targetController_ tabStripView] frame];
     TabView* draggedTabView = (TabView*)[draggedController_ selectedTabView];
     NSRect tabFrame = [draggedTabView frame];
     tabFrame.origin = [dragWindow_ convertBaseToScreen:tabFrame.origin];
     tabFrame.origin = [[targetController_ window]
                         convertScreenToBase:tabFrame.origin];
     tabFrame = [[targetController_ tabStripView]
                 convertRect:tabFrame fromView:nil];
-    NSPoint point =
-      [sourceWindow_ convertBaseToScreen:
-       [draggedTabView convertPoint:NSZeroPoint toView:nil]];
     [targetController_ insertPlaceholderForTab:self
                                          frame:tabFrame
                                  yStretchiness:0];
     [targetController_ layoutTabs];
   } else {
     [dragWindow_ makeKeyAndOrderFront:nil];
   }
 
   // Adjust the visibility of the window background. If there is a drop target,
   // we want to hide the window background so the tab stands out for
@@ skipping 434 matching lines @@
   }
 
   if (nextUpdate < kNoUpdate)
     [self performSelector:_cmd withObject:nil afterDelay:nextUpdate];
 
   [self resetLastGlowUpdateTime];
   [self setNeedsDisplay:YES];
 }
 
 @end  // @implementation TabView(Private)