mac: Delete more 10.5-only code

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"
 
 namespace {
 
 // Draws an NSImage or an NSImageRep with a given size into a SkBitmap.
@@ skipping 29 matching lines @@
                               kCGBitmapByteOrder32Host));
 #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.
-  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
-  // machine, about 4x faster). Unfortunately on 10.5 NSImageRep doesn't do
-  // caching. For this reason we draw using an NSImage if available. Once
-  // 10.5 is no longer supported we can drop this and always use NSImageRep.
   if (image) {
     [image drawInRect:drawRect
              fromRect:NSZeroRect
             operation:NSCompositeCopy
              fraction:1.0];
   } else {
-    // Use NSCompositeCopy if available, it's slightly faster.
-    if ([image_rep respondsToSelector:@selector(
-        drawInRect:fromRect:operation:fraction:respectFlipped:hints:)]) {
-      [image_rep drawInRect:drawRect
-                   fromRect:NSZeroRect
-                  operation:NSCompositeCopy
-                   fraction:1.0
-             respectFlipped:NO
-                      hints:NO];
-    } else {
-      [image_rep drawInRect:drawRect];
-    }
+    [image_rep drawInRect:drawRect
+                 fromRect:NSZeroRect
+                operation:NSCompositeCopy
+                 fraction:1.0
+           respectFlipped:NO
+                    hints:NO];
   }
 
   [NSGraphicsContext restoreGraphicsState];
-  if (!old_context && base::mac::IsOSLeopardOrEarlier())
-    [NSGraphicsContext setCurrentContext:nil];
 
   return bitmap;
 }
 
 } // namespace
 
 namespace gfx {
 
 CGAffineTransform SkMatrixToCGAffineTransform(const SkMatrix& matrix) {
   // CGAffineTransforms don't support perspective transforms, so make sure
@@ skipping 108 matching lines @@
   // copy it to the stack and return it.
   SkBitmap bitmap = device->accessBitmap(false);
 
   return bitmap;
 }
 
 SkBitmap NSImageToSkBitmap(NSImage* image, NSSize size, bool is_opaque) {
   return NSImageOrNSImageRepToSkBitmap(image, nil, size, is_opaque);
 }
 
-SkBitmap NSImageRepToSkBitmap(NSImageRep* image, NSSize size, bool is_opaque) {
-  return NSImageOrNSImageRepToSkBitmap(nil, image, size, is_opaque);
+SkBitmap NSImageRepToSkBitmap(
+    NSImageRep* image_rep, NSSize size, bool is_opaque) {
+  return NSImageOrNSImageRepToSkBitmap(nil, image_rep, size, is_opaque);
 }
 
 NSBitmapImageRep* SkBitmapToNSBitmapImageRep(const SkBitmap& skiaBitmap) {
   base::mac::ScopedCFTypeRef<CGColorSpaceRef> color_space(
       CGColorSpaceCreateWithName(kCGColorSpaceGenericRGB));
 
   // First convert SkBitmap to CGImageRef.
   base::mac::ScopedCFTypeRef<CGImageRef> cgimage(
       SkCreateCGImageRefWithColorspace(skiaBitmap, color_space));
 
@@ skipping 182 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