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

chrome/browser/ui/cocoa/dock_icon.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.
 
 #import "chrome/browser/ui/cocoa/dock_icon.h"
 
 #include "base/memory/scoped_nsobject.h"
+#include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h"
 
 // The fraction of the size of the dock icon that the badge is.
 static const float kBadgeFraction = 0.4f;
 
 // The indentation of the badge.
 static const float kBadgeIndent = 5.0f;
 
 // A view that draws our dock tile.
 @interface DockTileView : NSView {
  @private
@@ skipping 52 matching lines @@
                                                        green:0.85
                                                         blue:0.85
                                                        alpha:1.0];
   NSColor* backgroundHighlight =
       [backgroundColor blendedColorWithFraction:0.85
                                         ofColor:[NSColor whiteColor]];
   scoped_nsobject<NSGradient> backgroundGradient(
       [[NSGradient alloc] initWithStartingColor:backgroundHighlight
                                     endingColor:backgroundColor]);
   NSBezierPath* badgeEdge = [NSBezierPath bezierPathWithOvalInRect:badgeRect];
-  [NSGraphicsContext saveGraphicsState];
-  [badgeEdge addClip];
-  [backgroundGradient drawFromCenter:badgeCenter
-                              radius:0.0
-                            toCenter:badgeCenter
-                              radius:badgeRadius
-                             options:0];
-  [NSGraphicsContext restoreGraphicsState];
+  {
+    gfx::ScopedNSGraphicsContextSaveGState scopedGState;
+    [badgeEdge addClip];
+    [backgroundGradient drawFromCenter:badgeCenter
+                                radius:0.0
+                              toCenter:badgeCenter
+                                radius:badgeRadius
+                               options:0];
+  }
 
   // Slice
   if (!indeterminate_) {
     NSColor* sliceColor = [NSColor colorWithCalibratedRed:0.45
                                                     green:0.8
                                                      blue:0.25
                                                     alpha:1.0];
     NSColor* sliceHighlight =
         [sliceColor blendedColorWithFraction:0.4
                                      ofColor:[NSColor whiteColor]];
     scoped_nsobject<NSGradient> sliceGradient(
         [[NSGradient alloc] initWithStartingColor:sliceHighlight
                                       endingColor:sliceColor]);
     NSBezierPath* progressSlice;
     if (progress_ >= 1.0) {
       progressSlice = [NSBezierPath bezierPathWithOvalInRect:badgeRect];
     } else {
       CGFloat endAngle = 90.0 - 360.0 * progress_;
       if (endAngle < 0.0)
         endAngle += 360.0;
       progressSlice = [NSBezierPath bezierPath];
       [progressSlice moveToPoint:badgeCenter];
       [progressSlice appendBezierPathWithArcWithCenter:badgeCenter
                                                 radius:badgeRadius
                                             startAngle:90.0
                                               endAngle:endAngle
                                              clockwise:YES];
       [progressSlice closePath];
     }
-    [NSGraphicsContext saveGraphicsState];
+    gfx::ScopedNSGraphicsContextSaveGState scopedGState;
     [progressSlice addClip];
     [sliceGradient drawFromCenter:badgeCenter
                            radius:0.0
                          toCenter:badgeCenter
                            radius:badgeRadius
                           options:0];
-    [NSGraphicsContext restoreGraphicsState];
   }
 
   // Edge
-  [NSGraphicsContext saveGraphicsState];
-  [[NSColor whiteColor] set];
-  scoped_nsobject<NSShadow> shadow([[NSShadow alloc] init]);
-  [shadow.get() setShadowOffset:NSMakeSize(0, -2)];
-  [shadow setShadowBlurRadius:2];
-  [shadow set];
-  [badgeEdge setLineWidth:2];
-  [badgeEdge stroke];
-  [NSGraphicsContext restoreGraphicsState];
+  {
+    gfx::ScopedNSGraphicsContextSaveGState scopedGState;
+    [[NSColor whiteColor] set];
+    scoped_nsobject<NSShadow> shadow([[NSShadow alloc] init]);
+    [shadow.get() setShadowOffset:NSMakeSize(0, -2)];
+    [shadow setShadowBlurRadius:2];
+    [shadow set];
+    [badgeEdge setLineWidth:2];
+    [badgeEdge stroke];
+  }
 
   // Download count
   scoped_nsobject<NSNumberFormatter> formatter(
       [[NSNumberFormatter alloc] init]);
   NSString* countString =
       [formatter stringFromNumber:[NSNumber numberWithInt:downloads_]];
 
   scoped_nsobject<NSShadow> countShadow([[NSShadow alloc] init]);
   [countShadow setShadowBlurRadius:3.0];
   [countShadow.get() setShadowColor:[NSColor whiteColor]];
@@ skipping 68 matching lines @@
 }
 
 - (void)setProgress:(float)progress {
   NSDockTile* dockTile = [[NSApplication sharedApplication] dockTile];
   DockTileView* dockTileView = (DockTileView*)([dockTile contentView]);
 
   [dockTileView setProgress:progress];
 }
 
 @end