diff options
| author | asvitkine@chromium.org <asvitkine@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-23 21:17:30 +0000 |
|---|---|---|
| committer | asvitkine@chromium.org <asvitkine@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-23 21:17:30 +0000 |
| commit | 7e7a004713c446d6b888f75901f73176a0282982 (patch) | |
| tree | 8728238851f449943cc617f2045a1c678e8973f2 /skia | |
| parent | 65a78cbf36f6fd634edecfcd8439e171135eec18 (diff) | |
| download | chromium_src-7e7a004713c446d6b888f75901f73176a0282982.zip chromium_src-7e7a004713c446d6b888f75901f73176a0282982.tar.gz chromium_src-7e7a004713c446d6b888f75901f73176a0282982.tar.bz2 | |
Fix memory leaks in RenderTextMac.
This addresses a TODO from http://crrev.com/147862 to
not leak CFAttributedString attributes and additionally
ensures that the CTFontRef is properly disposed.
Also renames SkColorToCGColorRef() to CGColorCreateFromSkColor()
to be clear that it follows the Create rule.
BUG=125664
TEST=No leaks on waterfall.
Review URL: https://chromiumcodereview.appspot.com/10808084
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@147948 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia')
| -rw-r--r-- | skia/ext/skia_utils_mac.h | 2 | ||||
| -rw-r--r-- | skia/ext/skia_utils_mac.mm | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/skia/ext/skia_utils_mac.h b/skia/ext/skia_utils_mac.h index 79b9599..76820e2 100644 --- a/skia/ext/skia_utils_mac.h +++ b/skia/ext/skia_utils_mac.h @@ -62,7 +62,7 @@ CGRect SkRectToCGRect(const SkRect& rect); SK_API SkColor CGColorRefToSkColor(CGColorRef color); // Converts ARGB to CGColorRef. -SK_API CGColorRef SkColorToCGColorRef(SkColor color); +SK_API CGColorRef CGColorCreateFromSkColor(SkColor color); // Converts NSColor to ARGB. Returns raw rgb values and does no colorspace // conversion. Only valid for colors in calibrated and device color spaces. diff --git a/skia/ext/skia_utils_mac.mm b/skia/ext/skia_utils_mac.mm index 59bf255..1811dae 100644 --- a/skia/ext/skia_utils_mac.mm +++ b/skia/ext/skia_utils_mac.mm @@ -153,7 +153,7 @@ SkColor CGColorRefToSkColor(CGColorRef color) { } // Converts ARGB to CGColorRef. -CGColorRef SkColorToCGColorRef(SkColor color) { +CGColorRef CGColorCreateFromSkColor(SkColor color) { return CGColorCreateGenericRGB(SkColorGetR(color) / 255.0, SkColorGetG(color) / 255.0, SkColorGetB(color) / 255.0, |