diff options
| author | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-17 22:40:49 +0000 |
|---|---|---|
| committer | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-17 22:40:49 +0000 |
| commit | 62c6a781a95250f273f3bd3df945b3ff850e913e (patch) | |
| tree | c28cafb3018b81a85227781fd46c3ebe0160f1d6 /gfx/canvas_skia_mac.mm | |
| parent | 1c53ffde1ea034448b09129c975d93aa83b16c94 (diff) | |
| download | chromium_src-62c6a781a95250f273f3bd3df945b3ff850e913e.zip chromium_src-62c6a781a95250f273f3bd3df945b3ff850e913e.tar.gz chromium_src-62c6a781a95250f273f3bd3df945b3ff850e913e.tar.bz2 | |
Cleanup:
* Remove unnecessary code
* Make function declaration style match style guide (one arg per line is preferred when all don't fit, but related args may be together)
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/3109019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56432 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gfx/canvas_skia_mac.mm')
| -rw-r--r-- | gfx/canvas_skia_mac.mm | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/gfx/canvas_skia_mac.mm b/gfx/canvas_skia_mac.mm index e2cb553..f134eda 100644 --- a/gfx/canvas_skia_mac.mm +++ b/gfx/canvas_skia_mac.mm @@ -27,7 +27,8 @@ CanvasSkia::~CanvasSkia() { // static void CanvasSkia::SizeStringInt(const std::wstring& text, const gfx::Font& font, - int *width, int *height, int flags) { + int* width, int* height, + int flags) { NSFont* native_font = font.GetNativeFont(); NSString* ns_string = base::SysWideToNSString(text); NSDictionary* attributes = @@ -38,8 +39,10 @@ void CanvasSkia::SizeStringInt(const std::wstring& text, *height = font.GetHeight(); } -void CanvasSkia::DrawStringInt(const std::wstring& text, const gfx::Font& font, - const SkColor& color, int x, int y, int w, int h, +void CanvasSkia::DrawStringInt(const std::wstring& text, + const gfx::Font& font, + const SkColor& color, + int x, int y, int w, int h, int flags) { if (!IntersectsClipRectInt(x, y, w, h)) return; @@ -68,7 +71,8 @@ void CanvasSkia::DrawStringInt(const std::wstring& text, const gfx::Font& font, [[[NSAttributedString alloc] initWithString:base::SysWideToNSString(text) attributes:attributes] autorelease]; scoped_cftyperef<CTFramesetterRef> framesetter( - CTFramesetterCreateWithAttributedString(reinterpret_cast<CFAttributedStringRef>(ns_string))); + CTFramesetterCreateWithAttributedString( + reinterpret_cast<CFAttributedStringRef>(ns_string))); CGRect text_bounds = CGRectMake(x, y, w, h); CGMutablePathRef path = CGPathCreateMutable(); |