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

chrome/browser/ui/cocoa/download/download_item_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.
 
 #import "chrome/browser/ui/cocoa/download/download_item_cell.h"
 
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/download/download_item.h"
 #include "chrome/browser/download/download_item_model.h"
 #include "chrome/browser/download/download_manager.h"
 #include "chrome/browser/download/download_util.h"
 #import "chrome/browser/themes/theme_service.h"
 #import "chrome/browser/ui/cocoa/download/download_item_cell.h"
 #import "chrome/browser/ui/cocoa/image_utils.h"
 #import "chrome/browser/ui/cocoa/themed_window.h"
 #include "grit/theme_resources.h"
 #import "third_party/GTM/AppKit/GTMNSAnimation+Duration.h"
 #import "third_party/GTM/AppKit/GTMNSColor+Luminance.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/text/text_elider.h"
 #include "ui/gfx/canvas_skia_paint.h"
+#include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h"
 
 namespace {
 
 // Distance from top border to icon.
 const CGFloat kImagePaddingTop = 7;
 
 // Distance from left border to icon.
 const CGFloat kImagePaddingLeft = 9;
 
 // Width of icon.
@@ skipping 614 matching lines @@
   NSPoint p2 = NSMakePoint(cx + kDropdownArrowWidth/2,
                            cy - kDropdownArrowHeight/3 + kDropdownAreaY);
   NSPoint p3 = NSMakePoint(cx, cy + kDropdownArrowHeight*2/3 + kDropdownAreaY);
   NSBezierPath *triangle = [NSBezierPath bezierPath];
   [triangle moveToPoint:p1];
   [triangle lineToPoint:p2];
   [triangle lineToPoint:p3];
   [triangle closePath];
 
   NSGraphicsContext* context = [NSGraphicsContext currentContext];
-  [context saveGraphicsState];
+  gfx::ScopedNSGraphicsContextSaveGState scopedGState(context);
 
   scoped_nsobject<NSShadow> shadow([[NSShadow alloc] init]);
   [shadow.get() setShadowColor:[NSColor whiteColor]];
   [shadow.get() setShadowOffset:NSMakeSize(0, -1)];
   [shadow setShadowBlurRadius:0.0];
   [shadow set];
 
   NSColor* fill = [self titleColorForPart:kDownloadItemMouseOverDropdownPart];
   [fill setFill];
 
   [triangle fill];
-
-  [context restoreGraphicsState];
 }
 
 - (NSRect)imageRectForBounds:(NSRect)cellFrame {
   return NSMakeRect(cellFrame.origin.x + kImagePaddingLeft,
                     cellFrame.origin.y + kImagePaddingTop,
                     kImageWidth,
                     kImageHeight);
 }
 
 - (void)hideSecondaryTitle {
@@ skipping 46 matching lines @@
   }
   return self;
 }
 
 - (void)setCurrentProgress:(NSAnimationProgress)progress {
   [super setCurrentProgress:progress];
   [cell_ animation:self progressed:progress];
 }
 
 @end