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/surface | |
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/surface')
-rw-r--r-- | ui/surface/accelerated_surface_mac.cc | 4 | ||||
-rw-r--r-- | ui/surface/accelerated_surface_mac.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ui/surface/accelerated_surface_mac.cc b/ui/surface/accelerated_surface_mac.cc index ce80eb0..5c63de7 100644 --- a/ui/surface/accelerated_surface_mac.cc +++ b/ui/surface/accelerated_surface_mac.cc @@ -116,7 +116,7 @@ static void AddBooleanValue(CFMutableDictionaryRef dictionary, static void AddIntegerValue(CFMutableDictionaryRef dictionary, const CFStringRef key, int32 value) { - base::mac::ScopedCFTypeRef<CFNumberRef> number( + base::ScopedCFTypeRef<CFNumberRef> number( CFNumberCreate(NULL, kCFNumberSInt32Type, &value)); CFDictionaryAddValue(dictionary, key, number.get()); } @@ -215,7 +215,7 @@ uint32 AcceleratedSurface::SetSurfaceSize(const gfx::Size& size) { // Allocate a new IOSurface, which is the GPU resource that can be // shared across processes. - base::mac::ScopedCFTypeRef<CFMutableDictionaryRef> properties; + base::ScopedCFTypeRef<CFMutableDictionaryRef> properties; properties.reset(CFDictionaryCreateMutable(kCFAllocatorDefault, 0, &kCFTypeDictionaryKeyCallBacks, diff --git a/ui/surface/accelerated_surface_mac.h b/ui/surface/accelerated_surface_mac.h index e070287..0fbcbdb 100644 --- a/ui/surface/accelerated_surface_mac.h +++ b/ui/surface/accelerated_surface_mac.h @@ -118,7 +118,7 @@ class SURFACE_EXPORT AcceleratedSurface { // to the shared region (IOSurface). scoped_refptr<gfx::GLSurface> gl_surface_; scoped_refptr<gfx::GLContext> gl_context_; - base::mac::ScopedCFTypeRef<CFTypeRef> io_surface_; + base::ScopedCFTypeRef<CFTypeRef> io_surface_; // The id of |io_surface_| or 0 if that's NULL. uint32 io_surface_id_; |