summaryrefslogtreecommitdiffstats
path: root/gfx
diff options
context:
space:
mode:
Diffstat (limited to 'gfx')
-rw-r--r--gfx/blit.cc6
-rw-r--r--gfx/canvas_skia_mac.mm6
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);