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

chrome/browser/ui/cocoa/find_bar/find_bar_view.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/find_bar/find_bar_view.h"
 
 #import "chrome/browser/ui/cocoa/nsview_additions.h"
 #import "chrome/browser/ui/cocoa/themed_window.h"
 #import "chrome/browser/ui/cocoa/url_drop_target.h"
 #import "chrome/browser/ui/cocoa/view_id_util.h"
+#include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h"
 
 namespace {
 CGFloat kCurveSize = 8;
 }  // end namespace
 
 @implementation FindBarView
 
 - (void)awakeFromNib {
   // Register for all the drag types handled by the RWHVCocoa.
   [self registerForDraggedTypes:[URLDropTargetHandler handledDragTypes]];
@@ skipping 33 matching lines @@
         controlPoint2:NSMakePoint(midLeft2.x, bottomLeft.y)];
 
   [path lineToPoint:bottomRight];
   [path curveToPoint:midRight1
         controlPoint1:NSMakePoint(midRight1.x, bottomLeft.y)
         controlPoint2:NSMakePoint(midRight1.x, bottomLeft.y)];
   [path lineToPoint:midRight2];
   [path curveToPoint:topRight
         controlPoint1:NSMakePoint(midRight2.x, topLeft.y)
         controlPoint2:NSMakePoint(midRight2.x, topLeft.y)];
-  NSGraphicsContext* context = [NSGraphicsContext currentContext];
-  [context saveGraphicsState];
-  [path addClip];
 
-  // Set the pattern phase
-  NSPoint phase = [[self window] themePatternPhase];
+  {
+    NSGraphicsContext* context = [NSGraphicsContext currentContext];
+    gfx::ScopedNSGraphicsContextSaveGState scopedGState(context);
+    [path addClip];
 
-  [context setPatternPhase:phase];
-  [super drawBackground];
-  [context restoreGraphicsState];
+    // Set the pattern phase
+    NSPoint phase = [[self window] themePatternPhase];
+
+    [context setPatternPhase:phase];
+    [super drawBackground];
+  }
 
   [[self strokeColor] set];
   [path setLineWidth:lineWidth];
   [path stroke];
 }
 
 // The findbar is mostly opaque, but has an 8px transparent border on the left
 // and right sides (see |kCurveSize|).  This is an artifact of the way it is
 // drawn.  We override hitTest to return nil for points in this transparent
 // area.
@@ skipping 49 matching lines @@
   return VIEW_ID_FIND_IN_PAGE;
 }
 
 // Specifies that mouse events over this view should be ignored by the
 // render host.
 - (BOOL)nonWebContentView {
   return YES;
 }
 
 @end