Move scoped_cftyperef from base to base/mac, use the new namespace, and name ...

gfx/blit.cc

 // Copyright (c) 2009 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 "gfx/blit.h"
 
 #include "base/logging.h"
 #include "build/build_config.h"
 #include "gfx/point.h"
 #include "gfx/rect.h"
 #include "skia/ext/platform_canvas.h"
 #include "skia/ext/platform_device.h"
 
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
 #include <cairo/cairo.h>
 #endif
 
 #if defined(OS_MACOSX)
 #include "base/mac_util.h"
-#include "base/scoped_cftyperef.h"
+#include "base/mac/scoped_cftyperef.h"
 #endif
 
 namespace gfx {
 
 namespace {
 
 // Returns true if the given canvas has any part of itself clipped out or
 // any non-identity tranform.
 bool HasClipOrTransform(const skia::PlatformCanvas& canvas) {
   if (!canvas.getTotalMatrix().isIdentity())
@@ skipping 32 matching lines @@
   // If there is a translation on the source context, we need to account for
   // it ourselves since CGBitmapContextCreateImage will bypass it.
   Rect src_rect(src_origin, dst_rect.size());
   CGAffineTransform transform = CGContextGetCTM(src_context);
   bool flipped = fabs(transform.d + 1) < 0.0001;
   CGFloat delta_y = flipped ? CGBitmapContextGetHeight(src_context) -
                               transform.ty
                             : transform.ty;
   src_rect.Offset(transform.tx, delta_y);
 
-  scoped_cftyperef<CGImageRef>
+  base::mac::ScopedCFTypeRef<CGImageRef>
       src_image(CGBitmapContextCreateImage(src_context));
-  scoped_cftyperef<CGImageRef> src_sub_image(
+  base::mac::ScopedCFTypeRef<CGImageRef> src_sub_image(
       CGImageCreateWithImageInRect(src_image, src_rect.ToCGRect()));
   CGContextDrawImage(dst_context, dst_rect.ToCGRect(), src_sub_image);
 #else  // Linux, BSD, others
   // Only translations in the source context are supported; more complex
   // source context transforms will be ignored.
   cairo_save(dst_context);
   double surface_x = src_origin.x();
   double surface_y = src_origin.y();
   cairo_user_to_device(src_context, &surface_x, &surface_y);
   cairo_set_source_surface(dst_context, cairo_get_target(src_context),
@@ skipping 108 matching lines @@
       memmove(bitmap.getAddr32(dest_rect.x(), dest_rect.y() + y),
               bitmap.getAddr32(src_rect.x(), src_rect.y() + y),
               row_bytes);
     }
   }
 }
 
 #endif
 
 }  // namespace gfx