summaryrefslogtreecommitdiffstats
path: root/printing/image.cc
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-17 04:09:06 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-17 04:09:06 +0000
commitdf0ca6c858762b101bf424ff6c0522409fa195fc (patch)
treeefa188eee6972e2c0de358f2d19a2348ce6dcb06 /printing/image.cc
parent73de26a684944782a92f8e6840e1b290c9a424cd (diff)
downloadchromium_src-df0ca6c858762b101bf424ff6c0522409fa195fc.zip
chromium_src-df0ca6c858762b101bf424ff6c0522409fa195fc.tar.gz
chromium_src-df0ca6c858762b101bf424ff6c0522409fa195fc.tar.bz2
Move scoped_cftyperef from base to base/mac, use the new namespace, and name it
properly (scoped_cftyperef -> ScopedCFTypeRef). TEST=it compiles BUG=none Review URL: http://codereview.chromium.org/3855001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62887 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'printing/image.cc')
-rw-r--r--printing/image.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/printing/image.cc b/printing/image.cc
index 51b5ea7..27822cf 100644
--- a/printing/image.cc
+++ b/printing/image.cc
@@ -15,7 +15,7 @@
#include "gfx/gdi_util.h" // EMF support
#elif defined(OS_MACOSX)
#include <ApplicationServices/ApplicationServices.h>
-#include "base/scoped_cftyperef.h"
+#include "base/mac/scoped_cftyperef.h"
#endif
namespace {
@@ -243,9 +243,9 @@ bool Image::LoadMetafile(const NativeMetafile& metafile) {
size_t bytes = row_length_ * size_.height();
DCHECK(bytes);
data_.resize(bytes);
- scoped_cftyperef<CGColorSpaceRef> color_space(
+ base::mac::ScopedCFTypeRef<CGColorSpaceRef> color_space(
CGColorSpaceCreateWithName(kCGColorSpaceGenericRGB));
- scoped_cftyperef<CGContextRef> bitmap_context(
+ base::mac::ScopedCFTypeRef<CGContextRef> bitmap_context(
CGBitmapContextCreate(&*data_.begin(), size_.width(), size_.height(),
8, row_length_, color_space,
kCGImageAlphaPremultipliedLast));