[Mac] Adapt browser-action image-drawing to ignore flipped.

chrome/browser/cocoa/extensions/browser_action_button.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/extensions/browser_action_button.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/logging.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/cocoa/extensions/extension_action_context_menu.h"
+#import "chrome/browser/cocoa/image_utils.h"
 #include "chrome/browser/extensions/image_loading_tracker.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_action.h"
 #include "chrome/common/extensions/extension_resource.h"
 #include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_registrar.h"
 #include "chrome/common/notification_source.h"
 #include "chrome/common/notification_type.h"
 #include "gfx/canvas_paint.h"
 #include "gfx/rect.h"
@@ skipping 273 matching lines @@
                   bitsPerPixel:0];
 
   [NSGraphicsContext saveGraphicsState];
   [NSGraphicsContext setCurrentContext:
       [NSGraphicsContext graphicsContextWithBitmapImageRep:bitmap]];
   [[NSColor clearColor] set];
   NSRectFill(bounds);
   [[self cell] setIconShadow];
 
   NSImage* actionImage = [self image];
-  // Never draw within a flipped coordinate system.
-  // TODO(andybons): Figure out why |flipped| can be yes in certain cases.
-  // http://crbug.com/38943
-  [actionImage setFlipped:NO];
-  CGFloat xPos = std::floor((NSWidth(bounds) - [actionImage size].width) / 2);
-  CGFloat yPos = std::floor((NSHeight(bounds) - [actionImage size].height) / 2);
-  [actionImage drawAtPoint:NSMakePoint(xPos, yPos)
-                  fromRect:NSZeroRect
-                 operation:NSCompositeSourceOver
-                  fraction:1.0];
+  const NSSize imageSize = [actionImage size];
+  const NSRect imageRect =
+      NSMakeRect(std::floor((NSWidth(bounds) - imageSize.width) / 2.0),
+                 std::floor((NSHeight(bounds) - imageSize.height) / 2.0),
+                 imageSize.width, imageSize.height);
+  [actionImage drawInRect:imageRect
+                 fromRect:NSZeroRect
+                operation:NSCompositeSourceOver
+                 fraction:1.0
+             neverFlipped:YES];
 
   bounds.origin.y += kShadowOffset - kBrowserActionBadgeOriginYOffset;
   bounds.origin.x -= kShadowOffset;
   [[self cell] drawBadgeWithinFrame:bounds];
 
   [NSGraphicsContext restoreGraphicsState];
   NSImage* compositeImage =
       [[[NSImage alloc] initWithSize:[bitmap size]] autorelease];
   [compositeImage addRepresentation:bitmap];
   return compositeImage;
@@ skipping 26 matching lines @@
 - (void)drawInteriorWithFrame:(NSRect)cellFrame inView:(NSView*)controlView {
   [NSGraphicsContext saveGraphicsState];
   [self setIconShadow];
   [super drawInteriorWithFrame:cellFrame inView:controlView];
   cellFrame.origin.y += kBrowserActionBadgeOriginYOffset;
   [self drawBadgeWithinFrame:cellFrame];
   [NSGraphicsContext restoreGraphicsState];
 }
 
 @end