diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-24 18:49:05 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-24 18:49:05 +0000 |
| commit | 3df79f4277938356ae3c7b3ecc25ab6165e8a899 (patch) | |
| tree | a1a39cd236c8800a13f2f3bf879d69505a2508de /ui/base | |
| parent | 8a15ea13737ae2f8444424fc14d1fcd5e42d5218 (diff) | |
| download | chromium_src-3df79f4277938356ae3c7b3ecc25ab6165e8a899.zip chromium_src-3df79f4277938356ae3c7b3ecc25ab6165e8a899.tar.gz chromium_src-3df79f4277938356ae3c7b3ecc25ab6165e8a899.tar.bz2 | |
mac: Replace base::mac::ScopedCFTypeRef with base::ScopedCFTypeRef.
This CL was created fully mechanically by running
git grep -l base::mac::ScopedCFTypeRef | xargs sed -i -e 's/base::mac::ScopedCFTypeRef/base::ScopedCFTypeRef/g'
git commit -a -m.
git clang-format HEAD^ --style=Chromium
git commit -a -m.
git cl upload -t $TITLE
BUG=251957
TBR=mark@chromium.org
Review URL: https://codereview.chromium.org/16917011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@208245 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/base')
| -rw-r--r-- | ui/base/clipboard/clipboard_mac.mm | 10 | ||||
| -rw-r--r-- | ui/base/resource/resource_bundle_ios.mm | 19 |
2 files changed, 15 insertions, 14 deletions
diff --git a/ui/base/clipboard/clipboard_mac.mm b/ui/base/clipboard/clipboard_mac.mm index 759e5a0..bb5bfae 100644 --- a/ui/base/clipboard/clipboard_mac.mm +++ b/ui/base/clipboard/clipboard_mac.mm @@ -159,21 +159,21 @@ void Clipboard::WriteBitmap(const char* pixel_data, const char* size_data) { const gfx::Size* size = reinterpret_cast<const gfx::Size*>(size_data); // Safe because the image goes away before the call returns. - base::mac::ScopedCFTypeRef<CFDataRef> data( + base::ScopedCFTypeRef<CFDataRef> data( CFDataCreateWithBytesNoCopy(kCFAllocatorDefault, reinterpret_cast<const UInt8*>(pixel_data), - size->width()*size->height()*4, + size->width() * size->height() * 4, kCFAllocatorNull)); - base::mac::ScopedCFTypeRef<CGDataProviderRef> data_provider( + base::ScopedCFTypeRef<CGDataProviderRef> data_provider( CGDataProviderCreateWithCFData(data)); - base::mac::ScopedCFTypeRef<CGImageRef> cgimage( + base::ScopedCFTypeRef<CGImageRef> cgimage( CGImageCreate(size->width(), size->height(), 8, 32, - size->width()*4, + size->width() * 4, base::mac::GetSRGBColorSpace(), // TODO(avi): do better kCGImageAlphaPremultipliedFirst | kCGBitmapByteOrder32Host, data_provider, diff --git a/ui/base/resource/resource_bundle_ios.mm b/ui/base/resource/resource_bundle_ios.mm index f4919d7..d9f1fb5 100644 --- a/ui/base/resource/resource_bundle_ios.mm +++ b/ui/base/resource/resource_bundle_ios.mm @@ -135,15 +135,16 @@ gfx::Image& ResourceBundle::GetNativeImageNamed(int resource_id, ImageRTL rtl) { CGSize source_size = [ui_image size]; CGSize target_size = CGSizeMake(source_size.width * target_scale, source_size.height * target_scale); - base::mac::ScopedCFTypeRef<CGColorSpaceRef> color_space( + base::ScopedCFTypeRef<CGColorSpaceRef> color_space( CGColorSpaceCreateDeviceRGB()); - base::mac::ScopedCFTypeRef<CGContextRef> context( - CGBitmapContextCreate( - NULL, - target_size.width, target_size.height, - 8, target_size.width * 4, - color_space, - kCGImageAlphaPremultipliedFirst | kCGBitmapByteOrder32Host)); + base::ScopedCFTypeRef<CGContextRef> context(CGBitmapContextCreate( + NULL, + target_size.width, + target_size.height, + 8, + target_size.width * 4, + color_space, + kCGImageAlphaPremultipliedFirst | kCGBitmapByteOrder32Host)); CGRect target_rect = CGRectMake(0, 0, target_size.width, target_size.height); @@ -158,7 +159,7 @@ gfx::Image& ResourceBundle::GetNativeImageNamed(int resource_id, ImageRTL rtl) { CGContextFillRect(context, target_rect); } - base::mac::ScopedCFTypeRef<CGImageRef> cg_image( + base::ScopedCFTypeRef<CGImageRef> cg_image( CGBitmapContextCreateImage(context)); ui_image.reset([[UIImage alloc] initWithCGImage:cg_image scale:target_scale |