diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-17 04:09:06 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-17 04:09:06 +0000 |
| commit | df0ca6c858762b101bf424ff6c0522409fa195fc (patch) | |
| tree | efa188eee6972e2c0de358f2d19a2348ce6dcb06 /gfx | |
| parent | 73de26a684944782a92f8e6840e1b290c9a424cd (diff) | |
| download | chromium_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 'gfx')
| -rw-r--r-- | gfx/blit.cc | 6 | ||||
| -rw-r--r-- | gfx/canvas_skia_mac.mm | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/gfx/blit.cc b/gfx/blit.cc index 3c4f345..88d4057 100644 --- a/gfx/blit.cc +++ b/gfx/blit.cc @@ -17,7 +17,7 @@ #if defined(OS_MACOSX) #include "base/mac_util.h" -#include "base/scoped_cftyperef.h" +#include "base/mac/scoped_cftyperef.h" #endif namespace gfx { @@ -70,9 +70,9 @@ void BlitContextToContext(NativeDrawingContext dst_context, : 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 diff --git a/gfx/canvas_skia_mac.mm b/gfx/canvas_skia_mac.mm index f134eda..547a5e4 100644 --- a/gfx/canvas_skia_mac.mm +++ b/gfx/canvas_skia_mac.mm @@ -6,7 +6,7 @@ #include "gfx/canvas_skia.h" -#include "base/scoped_cftyperef.h" +#include "base/mac/scoped_cftyperef.h" #include "base/sys_string_conversions.h" #include "gfx/font.h" #include "gfx/rect.h" @@ -70,7 +70,7 @@ void CanvasSkia::DrawStringInt(const std::wstring& text, NSAttributedString* ns_string = [[[NSAttributedString alloc] initWithString:base::SysWideToNSString(text) attributes:attributes] autorelease]; - scoped_cftyperef<CTFramesetterRef> framesetter( + base::mac::ScopedCFTypeRef<CTFramesetterRef> framesetter( CTFramesetterCreateWithAttributedString( reinterpret_cast<CFAttributedStringRef>(ns_string))); @@ -78,7 +78,7 @@ void CanvasSkia::DrawStringInt(const std::wstring& text, CGMutablePathRef path = CGPathCreateMutable(); CGPathAddRect(path, NULL, text_bounds); - scoped_cftyperef<CTFrameRef> frame( + base::mac::ScopedCFTypeRef<CTFrameRef> frame( CTFramesetterCreateFrame(framesetter, CFRangeMake(0, 0), path, NULL)); CTFrameDraw(frame, context); CGContextRestoreGState(context); |