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

chrome/browser/ui/cocoa/styled_text_field_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/styled_text_field_cell.h"
 
 #include "base/logging.h"
 #include "chrome/browser/themes/theme_service.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/GTMNSBezierPath+RoundRect.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/font.h"
+#include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h"
 
 namespace {
 
 NSBezierPath* RectPathWithInset(StyledTextFieldCellRoundedFlags roundedFlags,
                                 const NSRect frame,
                                 const CGFloat inset,
                                 const CGFloat outerRadius) {
   NSRect insetFrame = NSInsetRect(frame, inset, inset);
 
   if (outerRadius > 0.0) {
@@ skipping 36 matching lines @@
                         const CGFloat lineWidth,
                         NSColor* color) {
   const CGFloat finalInset = inset + (lineWidth / 2.0);
   NSBezierPath* path =
       RectPathWithInset(roundedFlags, frame, finalInset, outerRadius);
   [color setStroke];
   [path setLineWidth:lineWidth];
   [path stroke];
 }
 
-// TODO(shess): Maybe we need a |cocoa_util.h|?
-class ScopedSaveGraphicsState {
- public:
-  ScopedSaveGraphicsState()
-      : context_([NSGraphicsContext currentContext]) {
-    [context_ saveGraphicsState];
-  }
-  explicit ScopedSaveGraphicsState(NSGraphicsContext* context)
-      : context_(context) {
-    [context_ saveGraphicsState];
-  }
-  ~ScopedSaveGraphicsState() {
-    [context_ restoreGraphicsState];
-  }
-
-private:
-  NSGraphicsContext* context_;
-};
-
 }  // namespace
 
 @implementation StyledTextFieldCell
 
 - (CGFloat)baselineAdjust {
   return 0.0;
 }
 
 - (CGFloat)cornerRadius {
   return 0.0;
@@ skipping 82 matching lines @@
   // Fill interior with background color.
   FillRectWithInset(roundedFlags, frame, lineWidth, radius,
                     [self backgroundColor]);
 
   // Draw the shadow.  For the rounded-rect case, the shadow needs to
   // slightly turn in at the corners.  |shadowFrame| is at the same
   // midline as the inner border line on the top and left, but at the
   // outer border line on the bottom and right.  The clipping change
   // will clip the bottom and right edges (and corner).
   {
-    ScopedSaveGraphicsState state;
+    gfx::ScopedNSGraphicsContextSaveGState state;
     [RectPathWithInset(roundedFlags, frame, lineWidth, radius) addClip];
     const NSRect shadowFrame =
         NSOffsetRect(frame, halfLineWidth, halfLineWidth);
     NSColor* shadowShade = [NSColor colorWithCalibratedWhite:0.0 alpha:0.05];
     FrameRectWithInset(roundedFlags, shadowFrame, halfLineWidth,
                        radius - halfLineWidth, lineWidth, shadowShade);
   }
 
   // Draw optional bezel below bottom stroke.
   if ([self shouldDrawBezel] && themeProvider &&
@@ skipping 14 matching lines @@
   if ([self showsFirstResponder]) {
     NSColor* color =
         [[NSColor keyboardFocusIndicatorColor] colorWithAlphaComponent:0.5];
     FrameRectWithInset(roundedFlags, frame, 0.0, radius, lineWidth * 2, color);
   }
 
   [self drawInteriorWithFrame:cellFrame inView:controlView];
 }
 
 @end