diff options
| author | dmaclach@chromium.org <dmaclach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-03 04:29:10 +0000 |
|---|---|---|
| committer | dmaclach@chromium.org <dmaclach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-03 04:29:10 +0000 |
| commit | 0c3bf9563dcd51310abbf9856db4aba416a664bf (patch) | |
| tree | 58393ab310ebe34e458f5725b2cae410ba1396f0 /ui/gfx/canvas_skia_mac.mm | |
| parent | 408292f44ad2b7087fae088ec10b1ad92470b4bd (diff) | |
| download | chromium_src-0c3bf9563dcd51310abbf9856db4aba416a664bf.zip chromium_src-0c3bf9563dcd51310abbf9856db4aba416a664bf.tar.gz chromium_src-0c3bf9563dcd51310abbf9856db4aba416a664bf.tar.bz2 | |
Clean up CF To NS Casts and make them slightly safer
Also adds streaming for CFStringRefs and CFErrorRefs making it
easier to add them to LOG() type statements.
BUG=NONE
TEST=BUILD
Review URL: http://codereview.chromium.org/6594096
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76714 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/gfx/canvas_skia_mac.mm')
| -rw-r--r-- | ui/gfx/canvas_skia_mac.mm | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ui/gfx/canvas_skia_mac.mm b/ui/gfx/canvas_skia_mac.mm index c82e1aa..c6fb031 100644 --- a/ui/gfx/canvas_skia_mac.mm +++ b/ui/gfx/canvas_skia_mac.mm @@ -6,6 +6,7 @@ #include "ui/gfx/canvas_skia.h" +#include "base/mac/mac_util.h" #include "base/mac/scoped_cftyperef.h" #include "base/sys_string_conversions.h" #include "third_party/skia/include/core/SkShader.h" @@ -72,7 +73,7 @@ void CanvasSkia::DrawStringInt(const string16& text, attributes:attributes] autorelease]; base::mac::ScopedCFTypeRef<CTFramesetterRef> framesetter( CTFramesetterCreateWithAttributedString( - reinterpret_cast<CFAttributedStringRef>(ns_string))); + base::mac::NSToCFCast(ns_string))); CGRect text_bounds = CGRectMake(x, y, w, h); CGMutablePathRef path = CGPathCreateMutable(); |