Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(253)

Side by Side Diff: ui/gfx/canvas_skia_mac.mm

Issue 8308008: mac: Fix a memory leak in canvas_skia_mac. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #import <Cocoa/Cocoa.h> 5 #import <Cocoa/Cocoa.h>
6 6
7 #include "ui/gfx/canvas_skia.h" 7 #include "ui/gfx/canvas_skia.h"
8 8
9 #include "base/mac/mac_util.h" 9 #include "base/mac/mac_util.h"
10 #include "base/mac/scoped_cftyperef.h" 10 #include "base/mac/scoped_cftyperef.h"
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 nil]; 60 nil];
61 61
62 NSAttributedString* ns_string = 62 NSAttributedString* ns_string =
63 [[[NSAttributedString alloc] initWithString:base::SysUTF16ToNSString(text) 63 [[[NSAttributedString alloc] initWithString:base::SysUTF16ToNSString(text)
64 attributes:attributes] autorelease]; 64 attributes:attributes] autorelease];
65 base::mac::ScopedCFTypeRef<CTFramesetterRef> framesetter( 65 base::mac::ScopedCFTypeRef<CTFramesetterRef> framesetter(
66 CTFramesetterCreateWithAttributedString( 66 CTFramesetterCreateWithAttributedString(
67 base::mac::NSToCFCast(ns_string))); 67 base::mac::NSToCFCast(ns_string)));
68 68
69 CGRect text_bounds = CGRectMake(x, y, w, h); 69 CGRect text_bounds = CGRectMake(x, y, w, h);
70 CGMutablePathRef path = CGPathCreateMutable(); 70 base::mac::ScopedCFTypeRef<CGMutablePathRef> path(CGPathCreateMutable());
71 CGPathAddRect(path, NULL, text_bounds); 71 CGPathAddRect(path, NULL, text_bounds);
72 72
73 base::mac::ScopedCFTypeRef<CTFrameRef> frame( 73 base::mac::ScopedCFTypeRef<CTFrameRef> frame(
74 CTFramesetterCreateFrame(framesetter, CFRangeMake(0, 0), path, NULL)); 74 CTFramesetterCreateFrame(framesetter, CFRangeMake(0, 0), path, NULL));
75 CTFrameDraw(frame, context); 75 CTFrameDraw(frame, context);
76 CGContextRestoreGState(context); 76 CGContextRestoreGState(context);
77 } 77 }
78 78
79 ui::TextureID CanvasSkia::GetTextureID() { 79 ui::TextureID CanvasSkia::GetTextureID() {
80 // TODO(wjmaclean) 80 // TODO(wjmaclean)
81 return 0; 81 return 0;
82 } 82 }
83 83
84 } // namespace gfx 84 } // namespace gfx
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698