Cache GTMTheme across windows to avoid re-creating it every time we create a ...

chrome/browser/cocoa/gradient_button_cell.mm

 // Copyright (c) 2009 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.
 
 #include "chrome/browser/cocoa/gradient_button_cell.h"
 #import "third_party/GTM/AppKit/GTMTheme.h"
 #import "base/scoped_nsobject.h"
 
 @interface GradientButtonCell (Private)
+- (void)sharedInit;
 - (void)drawUnderlayImageWithFrame:(NSRect)cellFrame
                             inView:(NSView*)controlView;
 @end
 
 
 @implementation GradientButtonCell
 
 // For nib instantiations
 - (id)initWithCoder:(NSCoder*)decoder {
   if ((self = [super initWithCoder:decoder])) {
-    shouldTheme_ = YES;
+    [self sharedInit];
   }
   return self;
 }
 
 // For programmatic instantiations
 - (id)initTextCell:(NSString*)string {
   if ((self = [super initTextCell:string])) {
-    shouldTheme_ = YES;
+    [self sharedInit];
   }
   return self;
 }
 
+- (void)sharedInit {
+    shouldTheme_ = YES;

[Mark Mentovai, 2009/08/26 01:25:49]

Indent is weird.

[pink (ping after 24hrs), 2009/08/26 14:55:56]

Done.

+  NSColor* startColor = [NSColor colorWithCalibratedWhite:1.0 alpha:0.666];
+  NSColor* endColor = [NSColor colorWithCalibratedWhite:1.0 alpha:0.333];
+  gradient_.reset([[NSGradient alloc]
+      initWithColorsAndLocations:startColor, 0.33, endColor, 1.0, nil]);
+}
+
 - (void)setShouldTheme:(BOOL)shouldTheme {
   shouldTheme_ = shouldTheme;
 }
 
 - (NSImage*)underlayImage {
   return underlayImage_;
 }
 
 - (void)setUnderlayImage:(NSImage*)image {
   underlayImage_.reset([image retain]);
@@ skipping 90 matching lines @@
     [[NSColor colorWithCalibratedWhite:1.0 alpha:0.2] setFill];
 
     // Draw the top inner highlight.
     NSAffineTransform* highlightTransform = [NSAffineTransform transform];
     [highlightTransform translateXBy:1 yBy:1];
     scoped_nsobject<NSBezierPath> highlightPath([innerPath copy]);
     [highlightPath transformUsingAffineTransform:highlightTransform];
 
     [highlightPath stroke];
 
-    NSColor* startColor = [NSColor colorWithCalibratedWhite:1.0 alpha:0.666];
-    NSColor* endColor = [NSColor colorWithCalibratedWhite:1.0 alpha:0.333];
-    scoped_nsobject<NSBezierPath> gradient([[NSGradient alloc]
-        initWithColorsAndLocations:startColor, 0.33, endColor, 1.0, nil]);
-
-    [gradient drawInBezierPath:innerPath angle:90.0];
+    [gradient_ drawInBezierPath:innerPath angle:90.0];
 
     [NSGraphicsContext restoreGraphicsState];
   }
 
   NSColor* stroke = [theme strokeColorForStyle:GTMThemeStyleToolBarButton
                                          state:active];
   [stroke setStroke];
 
   [innerPath setLineWidth:1];
   [innerPath stroke];
@@ skipping 126 matching lines @@
     imageRect.size = [underlayImage_ size];
     [underlayImage_ setFlipped:[controlView isFlipped]];
     [underlayImage_ drawInRect:[self imageRectForBounds:cellFrame]
                       fromRect:imageRect
                      operation:NSCompositeSourceOver
                       fraction:[self isEnabled] ? 1.0 : 0.5];
   }
 }
 
 @end