mac: Replace base::mac::ScopedCFTypeRef with base::ScopedCFTypeRef.

content/browser/renderer_host/backing_store_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.
 
 #import <Cocoa/Cocoa.h>
 
 #include "content/browser/renderer_host/backing_store_mac.h"
 
 #include <cmath>
 
@@ skipping 35 matching lines @@
 
 BackingStoreMac::~BackingStoreMac() {
 }
 
 void BackingStoreMac::ScaleFactorChanged(float device_scale_factor) {
   if (device_scale_factor == device_scale_factor_)
     return;
 
   device_scale_factor_ = device_scale_factor;
 
-  base::mac::ScopedCFTypeRef<CGLayerRef> new_layer(CreateCGLayer());
+  base::ScopedCFTypeRef<CGLayerRef> new_layer(CreateCGLayer());
   // If we have a layer, copy the old contents. A pixelated flash is better
   // than a white flash.
   if (new_layer && cg_layer_) {
     CGContextRef layer = CGLayerGetContext(new_layer);
     CGContextDrawLayerAtPoint(layer, CGPointMake(0, 0), cg_layer_);
   }
 
   cg_layer_.swap(new_layer);
   if (!cg_layer_) {
     // The view isn't in a window yet.  Use a CGBitmapContext for now.
@@ skipping 24 matching lines @@
 
   gfx::Size pixel_size = gfx::ToFlooredSize(
       gfx::ScaleSize(size(), device_scale_factor_));
   gfx::Rect pixel_bitmap_rect = ToFlooredRectDeprecated(
       gfx::ScaleRect(bitmap_rect, scale_factor));
 
   size_t bitmap_byte_count =
       pixel_bitmap_rect.width() * pixel_bitmap_rect.height() * 4;
   DCHECK_GE(dib->size(), bitmap_byte_count);
 
-  base::mac::ScopedCFTypeRef<CGDataProviderRef> data_provider(
-      CGDataProviderCreateWithData(NULL, dib->memory(),
-      bitmap_byte_count, NULL));
+  base::ScopedCFTypeRef<CGDataProviderRef> data_provider(
+      CGDataProviderCreateWithData(
+          NULL, dib->memory(), bitmap_byte_count, NULL));
 
-  base::mac::ScopedCFTypeRef<CGImageRef> bitmap_image(
-      CGImageCreate(pixel_bitmap_rect.width(), pixel_bitmap_rect.height(),
-          8, 32, 4 * pixel_bitmap_rect.width(),
-          base::mac::GetSystemColorSpace(),
-          kCGImageAlphaPremultipliedFirst | kCGBitmapByteOrder32Host,
-          data_provider, NULL, false, kCGRenderingIntentDefault));
+  base::ScopedCFTypeRef<CGImageRef> bitmap_image(
+      CGImageCreate(pixel_bitmap_rect.width(),
+                    pixel_bitmap_rect.height(),
+                    8,
+                    32,
+                    4 * pixel_bitmap_rect.width(),
+                    base::mac::GetSystemColorSpace(),
+                    kCGImageAlphaPremultipliedFirst | kCGBitmapByteOrder32Host,
+                    data_provider,
+                    NULL,
+                    false,
+                    kCGRenderingIntentDefault));
 
   for (size_t i = 0; i < copy_rects.size(); i++) {
     const gfx::Rect& copy_rect = copy_rects[i];
     gfx::Rect pixel_copy_rect = ToFlooredRectDeprecated(
         gfx::ScaleRect(copy_rect, scale_factor));
 
     // Only the subpixels given by copy_rect have pixels to copy.
-    base::mac::ScopedCFTypeRef<CGImageRef> image(
-        CGImageCreateWithImageInRect(bitmap_image, CGRectMake(
-            pixel_copy_rect.x() - pixel_bitmap_rect.x(),
-            pixel_copy_rect.y() - pixel_bitmap_rect.y(),
-            pixel_copy_rect.width(),
-            pixel_copy_rect.height())));
+    base::ScopedCFTypeRef<CGImageRef> image(CGImageCreateWithImageInRect(
+        bitmap_image,
+        CGRectMake(pixel_copy_rect.x() - pixel_bitmap_rect.x(),
+                   pixel_copy_rect.y() - pixel_bitmap_rect.y(),
+                   pixel_copy_rect.width(),
+                   pixel_copy_rect.height())));
 
     if (!cg_layer()) {
       // The view may have moved to a window.  Try to get a CGLayer.
       cg_layer_.reset(CreateCGLayer());
       if (cg_layer()) {
         // Now that we have a layer, copy the cached image into it.
-        base::mac::ScopedCFTypeRef<CGImageRef> bitmap_image(
+        base::ScopedCFTypeRef<CGImageRef> bitmap_image(
             CGBitmapContextCreateImage(cg_bitmap_));
         CGContextDrawImage(CGLayerGetContext(cg_layer()),
                            CGRectMake(0, 0, size().width(), size().height()),
                            bitmap_image);
         // Discard the cache bitmap, since we no longer need it.
         cg_bitmap_.reset(NULL);
       }
     }
 
     DCHECK_NE(static_cast<bool>(cg_layer()), static_cast<bool>(cg_bitmap()));
@@ skipping 56 matching lines @@
       gfx::ScopedCGContextSaveGState save_gstate(layer);
       CGContextClipToRect(layer,
                           CGRectMake(clip_rect.x(),
                                      size().height() - clip_rect.bottom(),
                                      clip_rect.width(),
                                      clip_rect.height()));
       CGContextDrawLayerAtPoint(layer,
                                 CGPointMake(delta.x(), -delta.y()), cg_layer());
     } else {
       // We don't have a layer, so scroll the contents of the CGBitmapContext.
-      base::mac::ScopedCFTypeRef<CGImageRef> bitmap_image(
+      base::ScopedCFTypeRef<CGImageRef> bitmap_image(
           CGBitmapContextCreateImage(cg_bitmap_));
       gfx::ScopedCGContextSaveGState save_gstate(cg_bitmap_);
       CGContextClipToRect(cg_bitmap_,
                           CGRectMake(clip_rect.x(),
                                      size().height() - clip_rect.bottom(),
                                      clip_rect.width(),
                                      clip_rect.height()));
       CGContextDrawImage(cg_bitmap_,
                          CGRectMake(delta.x(), -delta.y(),
                                     size().width(), size().height()),
                          bitmap_image);
     }
   }
 }
 
 void BackingStoreMac::CopyFromBackingStoreToCGContext(const CGRect& dest_rect,
                                                       CGContextRef context) {
   gfx::ScopedCGContextSaveGState save_gstate(context);
   CGContextSetInterpolationQuality(context, kCGInterpolationHigh);
   if (cg_layer_) {
     CGContextDrawLayerInRect(context, dest_rect, cg_layer_);
   } else {
-    base::mac::ScopedCFTypeRef<CGImageRef> image(
+    base::ScopedCFTypeRef<CGImageRef> image(
         CGBitmapContextCreateImage(cg_bitmap_));
     CGContextDrawImage(context, dest_rect, image);
   }
 }
 
 CGLayerRef BackingStoreMac::CreateCGLayer() {
   // The CGLayer should be optimized for drawing into the containing window,
   // so extract a CGContext corresponding to the window to be passed to
   // CGLayerCreateWithContext.
   NSWindow* window = [render_widget_host()->GetView()->GetNativeView() window];
@@ skipping 31 matching lines @@
                                                8, pixel_size.width() * 4,
                                                base::mac::GetSystemColorSpace(),
                                                kCGImageAlphaPremultipliedFirst |
                                                    kCGBitmapByteOrder32Host);
   DCHECK(context);
 
   return context;
 }
 
 }  // namespace content