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

Side by Side Diff: skia/ext/skia_utils_mac.mm

Issue 10808084: Fix memory leaks in RenderTextMac. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 5 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 | « skia/ext/skia_utils_mac.h ('k') | ui/gfx/render_text_mac.h » ('j') | 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #include "skia/ext/skia_utils_mac.h" 5 #include "skia/ext/skia_utils_mac.h"
6 6
7 #import <AppKit/AppKit.h> 7 #import <AppKit/AppKit.h>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/mac/mac_util.h" 10 #include "base/mac/mac_util.h"
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 SkColor CGColorRefToSkColor(CGColorRef color) { 146 SkColor CGColorRefToSkColor(CGColorRef color) {
147 DCHECK(CGColorGetNumberOfComponents(color) == 4); 147 DCHECK(CGColorGetNumberOfComponents(color) == 4);
148 const CGFloat* components = CGColorGetComponents(color); 148 const CGFloat* components = CGColorGetComponents(color);
149 return SkColorSetARGB(SkScalarRound(255.0 * components[3]), // alpha 149 return SkColorSetARGB(SkScalarRound(255.0 * components[3]), // alpha
150 SkScalarRound(255.0 * components[0]), // red 150 SkScalarRound(255.0 * components[0]), // red
151 SkScalarRound(255.0 * components[1]), // green 151 SkScalarRound(255.0 * components[1]), // green
152 SkScalarRound(255.0 * components[2])); // blue 152 SkScalarRound(255.0 * components[2])); // blue
153 } 153 }
154 154
155 // Converts ARGB to CGColorRef. 155 // Converts ARGB to CGColorRef.
156 CGColorRef SkColorToCGColorRef(SkColor color) { 156 CGColorRef CGColorCreateFromSkColor(SkColor color) {
157 return CGColorCreateGenericRGB(SkColorGetR(color) / 255.0, 157 return CGColorCreateGenericRGB(SkColorGetR(color) / 255.0,
158 SkColorGetG(color) / 255.0, 158 SkColorGetG(color) / 255.0,
159 SkColorGetB(color) / 255.0, 159 SkColorGetB(color) / 255.0,
160 SkColorGetA(color) / 255.0); 160 SkColorGetA(color) / 255.0);
161 } 161 }
162 162
163 // Converts NSColor to ARGB 163 // Converts NSColor to ARGB
164 SkColor NSDeviceColorToSkColor(NSColor* color) { 164 SkColor NSDeviceColorToSkColor(NSColor* color) {
165 DCHECK([color colorSpace] == [NSColorSpace genericRGBColorSpace] || 165 DCHECK([color colorSpace] == [NSColorSpace genericRGBColorSpace] ||
166 [color colorSpace] == [NSColorSpace deviceRGBColorSpace]); 166 [color colorSpace] == [NSColorSpace deviceRGBColorSpace]);
(...skipping 254 matching lines...) Expand 10 before | Expand all | Expand 10 after
421 // Apply content matrix. 421 // Apply content matrix.
422 SkMatrix skMatrix = canvas_->getTotalMatrix(); 422 SkMatrix skMatrix = canvas_->getTotalMatrix();
423 skMatrix.postTranslate(-SkIntToScalar(pt.fX), -SkIntToScalar(pt.fY)); 423 skMatrix.postTranslate(-SkIntToScalar(pt.fX), -SkIntToScalar(pt.fY));
424 CGAffineTransform affine = SkMatrixToCGAffineTransform(skMatrix); 424 CGAffineTransform affine = SkMatrixToCGAffineTransform(skMatrix);
425 CGContextConcatCTM(cgContext_, affine); 425 CGContextConcatCTM(cgContext_, affine);
426 426
427 return cgContext_; 427 return cgContext_;
428 } 428 }
429 429
430 } // namespace gfx 430 } // namespace gfx
OLDNEW
« no previous file with comments | « skia/ext/skia_utils_mac.h ('k') | ui/gfx/render_text_mac.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698