[rAC, OSX] Fix focus ring drawing.

chrome/browser/ui/cocoa/image_button_cell.mm

 // Copyright (c) 2011 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/image_button_cell.h"
 
 #include "base/logging.h"
 #import "chrome/browser/themes/theme_service.h"
 #import "chrome/browser/ui/cocoa/nsview_additions.h"
 #import "chrome/browser/ui/cocoa/rect_path_utils.h"
@@ skipping 41 matching lines @@
   [self setShowsBorderOnlyWhileMouseInside:YES];
 }
 
 - (NSImage*)imageForState:(image_button_cell::ButtonState)state
                      view:(NSView*)controlView{
   if (image_[state].imageId)
     return [self imageForID:image_[state].imageId controlView:controlView];
   return image_[state].image;
 }
 
-- (void)drawWithFrame:(NSRect)cellFrame inView:(NSView*)controlView {
+- (void)drawImageWithFrame:(NSRect)cellFrame inView:(NSView*)controlView {
   image_button_cell::ButtonState state = [self currentButtonState];
   BOOL windowHasFocus = [[controlView window] isMainWindow] ||
                         [[controlView window] isKeyWindow];
   CGFloat alpha = [self imageAlphaForWindowState:[controlView window]];
   NSImage* image = [self imageForState:state view:controlView];
 
   if (!windowHasFocus) {
     NSImage* defaultImage = [self
       imageForState:image_button_cell::kDefaultStateBackground
                view:controlView];
@@ skipping 17 matching lines @@
     roundf((NSWidth(cellFrame) - NSWidth(imageRect)) / 2.0);
   imageRect.origin.y = cellFrame.origin.y +
     roundf((NSHeight(cellFrame) - NSHeight(imageRect)) / 2.0);
 
   [image drawInRect:imageRect
            fromRect:NSZeroRect
           operation:NSCompositeSourceOver
            fraction:alpha
      respectFlipped:YES
               hints:nil];
+}
 
-  [self drawFocusRingWithFrame:cellFrame inView:controlView];
+- (void)drawWithFrame:(NSRect)cellFrame inView:(NSView*)controlView {
+  [self drawImageWithFrame:cellFrame inView:controlView];
+  // Only draw custom focus ring if the 10.7 focus ring APIs are not available.

[Nico, 2014/01/16 00:53:09]

Why? Who calls this on 10.7+?

[groby-ooo-7-16, 2014/01/16 01:05:51]

10.7+ automatically draws a focus ring using drawFocusRingMaskWithFrame:inView:,
separate from the -drawWithFrame: invocation.

Quoting NSCell docs: "The Application Kit automatically invokes this method when
appropriate, to render the view's focus ring."

+  // TODO(groby): Remove once we build against the 10.7 SDK.
+  if (![self respondsToSelector:@selector(drawFocusRingMaskWithFrame:inView:)])
+    [self drawFocusRingWithFrame:cellFrame inView:controlView];
 }
 
 - (void)setImageID:(NSInteger)imageID
     forButtonState:(image_button_cell::ButtonState)state {
   DCHECK_GE(state, 0);
   DCHECK_LT(state, image_button_cell::kButtonStateCount);
 
   image_[state].image.reset();
   image_[state].imageId = imageID;
   [[self controlView] setNeedsDisplay:YES];
@@ skipping 80 matching lines @@
 
 - (void)mouseEntered:(NSEvent*)theEvent {
   [self setIsMouseInside:YES];
 }
 
 - (void)mouseExited:(NSEvent*)theEvent {
   [self setIsMouseInside:NO];
 }
 
 @end