diff options
| author |  bungeman <bungeman@google.com> | 2015-06-08 13:39:12 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-06-08 13:39:13 -0700 |
| commit | 788840168f819240b2ad61d693149cd81ee24302 (patch) | |
| tree | 78253e830f7ffd80a7d09e365ca42b44997a497d /include/ports/SkTypeface_mac.h | |
| parent | 8ca89e18f54dcc9f18c17aff4d49791b310c4eeb (diff) | |
Provide tag-along for SkCreateTypefaceFromCTFont.
This provides a means of keeping an object alive for the entire
lifetime of an SkTypeface.
Review URL: https://codereview.chromium.org/1163573007
Diffstat (limited to 'include/ports/SkTypeface_mac.h')
| -rw-r--r-- | include/ports/SkTypeface_mac.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/include/ports/SkTypeface_mac.h b/include/ports/SkTypeface_mac.h index a59f8f7773..000c7baa89 100644 --- a/include/ports/SkTypeface_mac.h +++ b/include/ports/SkTypeface_mac.h @@ -1,4 +1,3 @@ - /* * Copyright 2011 Google Inc. * @@ -6,25 +5,25 @@ * found in the LICENSE file. */ - - #ifndef SkTypeface_mac_DEFINED #define SkTypeface_mac_DEFINED #include "SkTypeface.h" -#ifdef SK_BUILD_FOR_MAC -#import <ApplicationServices/ApplicationServices.h> -#endif -#ifdef SK_BUILD_FOR_IOS +#include <CoreFoundation/CoreFoundation.h> #include <CoreText/CoreText.h> -#endif + /** * Like the other Typeface create methods, this returns a new reference to the * corresponding typeface for the specified CTFontRef. The caller must call * unref() when it is finished. + * + * The CFTypeRef parameter, if provided, will be kept referenced for the + * lifetime of the SkTypeface. This was introduced as a means to work around + * https://crbug.com/413332 . */ -SK_API extern SkTypeface* SkCreateTypefaceFromCTFont(CTFontRef); +SK_API extern SkTypeface* SkCreateTypefaceFromCTFont(CTFontRef, CFTypeRef = NULL); + /** * Returns the platform-specific CTFontRef handle for a * given SkTypeface. Note that the returned CTFontRef gets @@ -36,4 +35,5 @@ SK_API extern SkTypeface* SkCreateTypefaceFromCTFont(CTFontRef); * See https://code.google.com/p/skia/issues/detail?id=3408 */ SK_API extern CTFontRef SkTypeface_GetCTFontRef(const SkTypeface* face); + #endif |