[Mac] Simplify generating composited browser-action image.

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"
@@ skipping 265 matching lines @@
       postNotificationName:kBrowserActionButtonUpdatedNotification
       object:self];
 }
 
 - (BOOL)isAnimating {
   return [moveAnimation_ isAnimating];
 }
 
 - (NSImage*)compositedImage {
   NSRect bounds = NSMakeRect(0, 0, kBrowserActionWidth, kBrowserActionHeight);
-  NSBitmapImageRep* bitmap = [[NSBitmapImageRep alloc]
-      initWithBitmapDataPlanes:NULL
-                    pixelsWide:NSWidth(bounds)
-                    pixelsHigh:NSHeight(bounds)
-                 bitsPerSample:8
-               samplesPerPixel:4
-                      hasAlpha:YES
-                      isPlanar:NO
-                colorSpaceName:NSCalibratedRGBColorSpace
-                  bitmapFormat:0
-                   bytesPerRow:0
-                  bitsPerPixel:0];
+  NSImage* image = [[[NSImage alloc] initWithSize:bounds.size] autorelease];
+  [image lockFocus];
 
-  [NSGraphicsContext saveGraphicsState];
-  [NSGraphicsContext setCurrentContext:
-      [NSGraphicsContext graphicsContextWithBitmapImageRep:bitmap]];
   [[NSColor clearColor] set];
   NSRectFill(bounds);
   [[self cell] setIconShadow];
 
   NSImage* actionImage = [self image];
   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;
+  [image unlockFocus];
+  return image;
 }
 
 @end
 
 @implementation BrowserActionCell
 
 @synthesize tabId = tabId_;
 @synthesize extensionAction = extensionAction_;
 
 - (void)setIconShadow {
@@ skipping 16 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