Merge 83125 - Add and use gfx::ScopedNSGraphicsContextState (ui/gfx/scoped_ns_graphics_context_st...

chrome/browser/ui/cocoa/gradient_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.
 
 #include "chrome/browser/ui/cocoa/gradient_button_cell.h"
 
 #include "base/logging.h"
 #import "base/memory/scoped_nsobject.h"
 #import "chrome/browser/themes/theme_service.h"
 #import "chrome/browser/ui/cocoa/image_utils.h"
 #import "chrome/browser/ui/cocoa/nsview_additions.h"
 #import "chrome/browser/ui/cocoa/themed_window.h"
 #include "grit/theme_resources.h"
 #import "third_party/GTM/AppKit/GTMNSColor+Luminance.h"
+#include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h"
 
 @interface GradientButtonCell (Private)
 - (void)sharedInit;
 
 // Get drawing parameters for a given cell frame in a given view. The inner
 // frame is the one required by |-drawInteriorWithFrame:inView:|. The inner and
 // outer paths are the ones required by |-drawBorderAndFillForTheme:...|. The
 // outer path also gives the area in which to clip. Any of the |return...|
 // arguments may be NULL (in which case the given parameter won't be returned).
 // If |returnInnerPath| or |returnOuterPath|, |*returnInnerPath| or
@@ skipping 371 matching lines @@
                 ThemeService::GRADIENT_TOOLBAR_BUTTON_PRESSED :
                 ThemeService::GRADIENT_TOOLBAR_BUTTON_PRESSED_INACTIVE) :
             nil;
       }
       [clickedGradient drawInBezierPath:innerPath angle:90.0];
     }
   }
 
   // Visually indicate unclicked, enabled buttons.
   if (!showClickedGradient && [self isEnabled]) {
-    [NSGraphicsContext saveGraphicsState];
+    gfx::ScopedNSGraphicsContextSaveGState scopedGState;
     [innerPath addClip];
 
     // Draw the inner glow.
     if (hoverAlpha > 0) {
       [innerPath setLineWidth:2];
       [[NSColor colorWithCalibratedWhite:1.0 alpha:0.2 * hoverAlpha] setStroke];
       [innerPath stroke];
     }
 
     // Draw the top inner highlight.
     NSAffineTransform* highlightTransform = [NSAffineTransform transform];
     [highlightTransform translateXBy:1 yBy:1];
     scoped_nsobject<NSBezierPath> highlightPath([innerPath copy]);
     [highlightPath transformUsingAffineTransform:highlightTransform];
     [[NSColor colorWithCalibratedWhite:1.0 alpha:0.2] setStroke];
     [highlightPath stroke];
 
     // Draw the gradient inside.
     [gradient drawInBezierPath:innerPath angle:90.0];
-
-    [NSGraphicsContext restoreGraphicsState];
   }
 
   // Don't draw anything else for disabled flat buttons.
   if (isFlatButton && ![self isEnabled])
     return;
 
   // Draw the outer stroke.
   NSColor* strokeColor = nil;
   if (showClickedGradient) {
     strokeColor = [NSColor
@@ skipping 131 matching lines @@
   }
   [self drawInteriorWithFrame:innerFrame inView:controlView];
 }
 
 - (void)drawInteriorWithFrame:(NSRect)cellFrame inView:(NSView*)controlView {
   const CGFloat lineWidth = [controlView cr_lineWidth];
 
   if (shouldTheme_) {
     BOOL isTemplate = [[self image] isTemplate];
 
-    [NSGraphicsContext saveGraphicsState];
+    gfx::ScopedNSGraphicsContextSaveGState scopedGState;
 
     CGContextRef context =
         (CGContextRef)([[NSGraphicsContext currentContext] graphicsPort]);
 
     ThemeService* themeProvider = static_cast<ThemeService*>(
         [[controlView window] themeProvider]);
     NSColor* color = themeProvider ?
         themeProvider->GetNSColorTint(ThemeService::TINT_BUTTONS,
                                       true) :
         [NSColor blackColor];
@@ skipping 14 matching lines @@
     [[self image] drawInRect:drawRect
                     fromRect:imageRect
                    operation:NSCompositeSourceOver
                     fraction:[self isEnabled] ? 1.0 : 0.5
                 neverFlipped:YES];
     if (isTemplate && color) {
       [color set];
       NSRectFillUsingOperation(cellFrame, NSCompositeSourceAtop);
     }
     CGContextEndTransparencyLayer(context);
-
-    [NSGraphicsContext restoreGraphicsState];
   } else {
     // NSCell draws these off-center for some reason, probably because of the
     // positioning of the control in the xib.
     [super drawInteriorWithFrame:NSOffsetRect(cellFrame, 0, lineWidth)
                           inView:controlView];
   }
 
   if (overlayImage_) {
     NSRect imageRect = NSZeroRect;
     imageRect.size = [overlayImage_ size];
@@ skipping 27 matching lines @@
   }
 
   // Gradient is about twice our line height long.
   CGFloat gradientWidth = MIN(size.height * 2, NSWidth(cellFrame) / 4);
 
   NSRect solidPart, gradientPart;
   NSDivideRect(cellFrame, &gradientPart, &solidPart, gradientWidth, NSMaxXEdge);
 
   // Draw non-gradient part without transparency layer, as light text on a dark
   // background looks bad with a gradient layer.
-  [[NSGraphicsContext currentContext] saveGraphicsState];
-  [NSBezierPath clipRect:solidPart];
+  NSPoint textOffset = NSZeroPoint;
+  {
+    gfx::ScopedNSGraphicsContextSaveGState scopedGState;
+    [NSBezierPath clipRect:solidPart];
 
-  // 11 is the magic number needed to make this match the native NSButtonCell's
-  // label display.
-  CGFloat textLeft = [[self image] size].width + 11;
+    // 11 is the magic number needed to make this match the native
+    // NSButtonCell's label display.
+    CGFloat textLeft = [[self image] size].width + 11;
 
-  // For some reason, the height of cellFrame as passed in is totally bogus.
-  // For vertical centering purposes, we need the bounds of the containing
-  // view.
-  NSRect buttonFrame = [[self controlView] frame];
+    // For some reason, the height of cellFrame as passed in is totally bogus.
+    // For vertical centering purposes, we need the bounds of the containing
+    // view.
+    NSRect buttonFrame = [[self controlView] frame];
 
-  // Off-by-one to match native NSButtonCell's version.
-  NSPoint textOffset = NSMakePoint(textLeft,
-                        (NSHeight(buttonFrame) - size.height)/2 + 1);
-  [title drawAtPoint:textOffset];
-  [[NSGraphicsContext currentContext] restoreGraphicsState];
+    // Off-by-one to match native NSButtonCell's version.
+    textOffset = NSMakePoint(textLeft,
+                             (NSHeight(buttonFrame) - size.height)/2 + 1);
+    [title drawAtPoint:textOffset];
+  }
 
   // Draw the gradient part with a transparency layer. This makes the text look
   // suboptimal, but since it fades out, that's ok.
-  [[NSGraphicsContext currentContext] saveGraphicsState];
+  gfx::ScopedNSGraphicsContextSaveGState scopedGState;
   [NSBezierPath clipRect:gradientPart];
   CGContextRef context = static_cast<CGContextRef>(
       [[NSGraphicsContext currentContext] graphicsPort]);
   CGContextBeginTransparencyLayerWithRect(context,
                                           NSRectToCGRect(gradientPart), 0);
   [title drawAtPoint:textOffset];
 
   // TODO(alcor): switch this to GTMLinearRGBShading if we ever need on 10.4
   NSColor *color = [NSColor textColor]; //[self textColor];
   NSColor *alphaColor = [color colorWithAlphaComponent:0.0];
   NSGradient *mask = [[NSGradient alloc] initWithStartingColor:color
                                                    endingColor:alphaColor];
 
   // Draw the gradient mask
   CGContextSetBlendMode(context, kCGBlendModeDestinationIn);
   [mask drawFromPoint:NSMakePoint(NSMaxX(cellFrame) - gradientWidth,
                                   NSMinY(cellFrame))
               toPoint:NSMakePoint(NSMaxX(cellFrame),
                                   NSMinY(cellFrame))
               options:NSGradientDrawsBeforeStartingLocation];
   [mask release];
   CGContextEndTransparencyLayer(context);
-  [[NSGraphicsContext currentContext] restoreGraphicsState];
 
   return cellFrame;
 }
 
 - (NSBezierPath*)clipPathForFrame:(NSRect)cellFrame
                            inView:(NSView*)controlView {
   NSBezierPath* boundingPath = nil;
   [self getDrawParamsForFrame:cellFrame
                        inView:controlView
                    innerFrame:NULL
@@ skipping 38 matching lines @@
                              options:options
                                owner:self
                             userInfo:nil]);
   if (isMouseInside_ != mouseInView) {
     [self setMouseInside:mouseInView animate:NO];
     [controlView setNeedsDisplay:YES];
   }
 }
 
 @end