Merge 143179 - mac: Don't let background tab highlight bleed into tabstrip border.

chrome/browser/ui/cocoa/tabs/tab_view.mm

 // Copyright (c) 2012 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/ui/cocoa/tabs/tab_view.h"
 
 #include "base/logging.h"
 #include "chrome/browser/themes/theme_service.h"
 #import "chrome/browser/ui/cocoa/nsview_additions.h"
 #import "chrome/browser/ui/cocoa/tabs/tab_controller.h"
@@ skipping 339 matching lines @@
 
           [glow drawInBezierPath:path relativeCenterPosition:hoverPoint_];
         }
       }
 
       CGContextEndTransparencyLayer(cgContext);
     }
 
     // Draw the top inner highlight within the tab if using the default theme.
     if (themeProvider && themeProvider->UsingDefaultTheme()) {
+      [highlightColor setStroke];
+      scoped_nsobject<NSBezierPath> highlightPath([path copy]);
+      [highlightPath setLineWidth:lineWidth];
+
+      if (!selected)
+        NSRectClip(NSOffsetRect(rect, 0, 2 * lineWidth));
+
       NSAffineTransform* highlightTransform = [NSAffineTransform transform];
       [highlightTransform translateXBy:lineWidth yBy:-lineWidth];
+      [highlightPath transformUsingAffineTransform:highlightTransform];
+      [highlightPath stroke];
 
-      scoped_nsobject<NSBezierPath> highlightPath([path copy]);
-      [highlightPath transformUsingAffineTransform:highlightTransform];
-      [highlightColor setStroke];
-      [highlightPath setLineWidth:lineWidth];
-      [highlightPath stroke];
       highlightTransform = [NSAffineTransform transform];
       [highlightTransform translateXBy:-2 * lineWidth yBy:0.0];
       [highlightPath transformUsingAffineTransform:highlightTransform];
       [highlightPath stroke];
     }
   }
 
   // Draw the top stroke.
   {
     gfx::ScopedNSGraphicsContextSaveGState drawBorderState;
@@ skipping 289 matching lines @@
       NSMakePoint(NSMinX(rect)  + kInsetMultiplier * NSHeight(rect),
                   NSMaxY(rect));
 
   NSBezierPath* path = [NSBezierPath bezierPath];
   [path moveToPoint:topLeft];
   [path lineToPoint:topRight];
   return path;
 }
 
 @end  // @implementation TabView(Private)