Mac: Use macro for static local.

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/i18n/rtl.h"
 #include "base/logging.h"
 #include "base/mac/sdk_forward_declarations.h"
 #include "base/strings/sys_string_conversions.h"
@@ skipping 28 matching lines @@
 // The default time interval in seconds between glow updates (when
 // increasing/decreasing).
 const NSTimeInterval kGlowUpdateInterval = 0.025;
 
 // This is used to judge whether the mouse has moved during rapid closure; if it
 // has moved less than the threshold, we want to close the tab.
 const CGFloat kRapidCloseDist = 2.5;
 
 namespace {
 
-ui::ThreePartImage* GetMaskImage() {
-  static ui::ThreePartImage* mask =
-      new ui::ThreePartImage(IDR_TAB_ALPHA_LEFT, 0, IDR_TAB_ALPHA_RIGHT);
+ui::ThreePartImage& GetMaskImage() {
+  CR_DEFINE_STATIC_LOCAL(ui::ThreePartImage, mask,
+                         (IDR_TAB_ALPHA_LEFT, 0, IDR_TAB_ALPHA_RIGHT));
   return mask;
 }
 
-ui::ThreePartImage* GetStrokeImage(bool active) {
-  static ui::ThreePartImage* activeStroke = new ui::ThreePartImage(
-      IDR_TAB_ACTIVE_LEFT, IDR_TAB_ACTIVE_CENTER, IDR_TAB_ACTIVE_RIGHT);
-  static ui::ThreePartImage* inactiveStroke = new ui::ThreePartImage(
-      IDR_TAB_INACTIVE_LEFT, IDR_TAB_INACTIVE_CENTER, IDR_TAB_INACTIVE_RIGHT);
+ui::ThreePartImage& GetStrokeImage(bool active) {
+  CR_DEFINE_STATIC_LOCAL(
+      ui::ThreePartImage, activeStroke,
+      (IDR_TAB_ACTIVE_LEFT, IDR_TAB_ACTIVE_CENTER, IDR_TAB_ACTIVE_RIGHT));
+  CR_DEFINE_STATIC_LOCAL(
+      ui::ThreePartImage, inactiveStroke,
+      (IDR_TAB_INACTIVE_LEFT, IDR_TAB_INACTIVE_CENTER, IDR_TAB_INACTIVE_RIGHT));
 
   return active ? activeStroke : inactiveStroke;
 }
 
 }  // namespace
 
 @interface TabView(Private)
 
 - (void)resetLastGlowUpdateTime;
 - (NSTimeInterval)timeElapsedSinceLastGlowUpdate;
@@ skipping 102 matching lines @@
 // Determines which view a click in our frame actually hit. It's either this
 // view or one of the child buttons.
 - (NSView*)hitTest:(NSPoint)aPoint {
   NSView* const defaultHitTestResult = [super hitTest:aPoint];
   if ([defaultHitTestResult isKindOfClass:[NSButton class]])
     return defaultHitTestResult;
 
   NSPoint viewPoint = [self convertPoint:aPoint fromView:[self superview]];
   NSRect maskRect = [self bounds];
   maskRect.size.height = kFillHeight;
-  return GetMaskImage()->HitTest(viewPoint, maskRect) ? self : nil;
+  return GetMaskImage().HitTest(viewPoint, maskRect) ? self : nil;
 }
 
 // Returns |YES| if this tab can be torn away into a new window.
 - (BOOL)canBeDragged {
   return [controller_ tabCanBeDragged:controller_];
 }
 
 // Handle clicks and drags in this button. We get here because we have
 // overridden acceptsFirstMouse: and the click is within our bounds.
 - (void)mouseDown:(NSEvent*)theEvent {
@@ skipping 135 matching lines @@
 
   [[self backgroundColorForSelected:(state_ != NSOffState)] set];
   NSRectFill(dirtyRect);
 
   if (state_ == NSOffState)
     [self drawGlow:dirtyRect];
 
   // If we filled outside the middle rect, we need to erase what we filled
   // outside the tab's shape.
   // This only works if we are drawing to our own backing layer.
-  if (!NSContainsRect(GetMaskImage()->GetMiddleRect(bounds), dirtyRect)) {
+  if (!NSContainsRect(GetMaskImage().GetMiddleRect(bounds), dirtyRect)) {
     DCHECK([self layer]);
-    GetMaskImage()->DrawInRect(bounds, NSCompositeDestinationIn, 1.0);
+    GetMaskImage().DrawInRect(bounds, NSCompositeDestinationIn, 1.0);
   }
 }
 
 // Draw the glow for hover and the overlay for alerts.
 - (void)drawGlow:(NSRect)dirtyRect {
   NSGraphicsContext* context = [NSGraphicsContext currentContext];
   CGContextRef cgContext = static_cast<CGContextRef>([context graphicsPort]);
 
   CGFloat hoverAlpha = [self hoverAlpha];
   CGFloat alertAlpha = [self alertAlpha];
@@ skipping 37 matching lines @@
     }
 
     CGContextEndTransparencyLayer(cgContext);
   }
 }
 
 // Draws the tab outline.
 - (void)drawStroke:(NSRect)dirtyRect {
   CGFloat alpha = [[self window] isMainWindow] ? 1.0 : tabs::kImageNoFocusAlpha;
   GetStrokeImage(state_ == NSOnState)
-      ->DrawInRect([self bounds], NSCompositeSourceOver, alpha);
+      .DrawInRect([self bounds], NSCompositeSourceOver, alpha);
 }
 
 - (void)drawRect:(NSRect)dirtyRect {
   [self drawFill:dirtyRect];
   [self drawStroke:dirtyRect];
 
   // We draw the title string directly instead of using a NSTextField subview.
   // This is so that we can get font smoothing to work on earlier OS, and even
   // when the tab background is a pattern image (when using themes).
   if (![titleView_ isHidden]) {
@@ skipping 282 matching lines @@
   }
 
   if (nextUpdate < kNoUpdate)
     [self performSelector:_cmd withObject:nil afterDelay:nextUpdate];
 
   [self resetLastGlowUpdateTime];
   [self setNeedsDisplay:YES];
 }
 
 @end  // @implementation TabView(Private)