Remove implicit dependency from 'skia' on 'ui'.

skia/ext/skia_utils_mac.mm

 // Copyright (c) 2012 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 "skia/ext/skia_utils_mac.h"
 
 #import <AppKit/AppKit.h>
 
 #include "base/logging.h"
 #include "base/mac/mac_util.h"
 #include "base/mac/scoped_cftyperef.h"
 #include "base/memory/scoped_nsobject.h"
 #include "base/memory/scoped_ptr.h"
 #include "skia/ext/bitmap_platform_device_mac.h"
 #include "third_party/skia/include/core/SkRegion.h"
 #include "third_party/skia/include/utils/mac/SkCGUtils.h"
-#include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h"
 
 // 10.6 API that we use if available.
 #if !defined(MAC_OS_X_VERSION_10_6) || \
     MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_6
 
 @interface NSImageRep (NSObject)
 
 - (BOOL)drawInRect:(NSRect)dstSpacePortionRect
           fromRect:(NSRect)srcSpacePortionRect
          operation:(NSCompositingOperation)op
@@ skipping 41 matching lines @@
 #else
 #error We require that Skia's and CoreGraphics's recommended \
        image memory layout match.
 #endif
 #undef HAS_ARGB_SHIFTS
 
   // Something went really wrong. Best guess is that the bitmap data is invalid.
   DCHECK(context);
 
   // Save the current graphics context so that we can restore it later.
-  gfx::ScopedNSGraphicsContextSaveGState scoped_g_state;
+  NSGraphicsContext* old_context = [NSGraphicsContext currentContext];
+  [NSGraphicsContext saveGraphicsState];
 
   // Dummy context that we will draw into.
   NSGraphicsContext* context_cocoa =
       [NSGraphicsContext graphicsContextWithGraphicsPort:context flipped:NO];
   [NSGraphicsContext setCurrentContext:context_cocoa];
 
   // This will stretch any images to |size| if it does not fit or is non-square.
   NSRect drawRect = NSMakeRect(0, 0, size.width, size.height);
 
   // NSImage does caching such that subsequent drawing is much faster (on my
@@ skipping 13 matching lines @@
                    fromRect:NSZeroRect
                   operation:NSCompositeCopy
                    fraction:1.0
              respectFlipped:NO
                       hints:NO];
     } else {
       [image_rep drawInRect:drawRect];
     }
   }
 
+  [NSGraphicsContext restoreGraphicsState];
+  if (!old_context && base::mac::IsOSLeopardOrEarlier())

[Robert Sesek, 2012/03/05 15:49:46]

Remove this condition; it's logic that would only be appropriate for the scoper
when old_context would be nil. It won't ever be so here.

[Nico, 2012/03/05 15:58:35]

Why's that? -currentContext could return nil, couldn't it?
(ScopedNSGraphicsContextSaveGState only ever sets its context_ to
-currentContext too at least.)

[Robert Sesek, 2012/03/05 17:23:58]

Because we're in a drawing context. The scoper is designed to be versatile. You
wouldn't ever do this check if you weren't using a scoper.

[Nico, 2012/03/05 17:33:00]

I don't understand, can you expand a bit? Why is -currentContext guaranteed to
be non-nil?

[Robert Sesek, 2012/03/05 17:40:04]

DAMN YOU RIETEVELD. I thought this was in |-drawRect:|.

Ok, this is fine. But ugly.

+    [NSGraphicsContext setCurrentContext:nil];
+
   return bitmap;
 }
 
 } // namespace
 
 namespace gfx {
 
 CGAffineTransform SkMatrixToCGAffineTransform(const SkMatrix& matrix) {
   // CGAffineTransforms don't support perspective transforms, so make sure
   // we don't get those.
@@ skipping 233 matching lines @@
   // Apply content matrix.
   SkMatrix skMatrix = canvas_->getTotalMatrix();
   skMatrix.postTranslate(-SkIntToScalar(pt.fX), -SkIntToScalar(pt.fY));
   CGAffineTransform affine = SkMatrixToCGAffineTransform(skMatrix);
   CGContextConcatCTM(cgContext_, affine);
   
   return cgContext_;
 }
 
 }  // namespace gfx