Index: include/ports/SkFontMgr.h |
diff --git a/include/ports/SkFontMgr.h b/include/ports/SkFontMgr.h |
index afadeaaa9785fe55f4f7ce686878d5487aed8c0f..a5b78c624178aa6ec60cf7c24533882c1aa3a589 100644 |
--- a/include/ports/SkFontMgr.h |
+++ b/include/ports/SkFontMgr.h |
@@ -150,10 +150,11 @@ |
/** |
* Create a typeface from the specified font data. |
+ * Takes ownership of the font data, so the caller should not reference it again. |
* Will return NULL if the typeface could not be created. |
* The caller must call unref() on the returned object if it is not null. |
*/ |
- SkTypeface* createFromFontData(std::unique_ptr<SkFontData>) const; |
+ SkTypeface* createFromFontData(SkFontData*) const; |
/** |
* Create a typeface for the specified fileName and TTC index |
@@ -191,7 +192,7 @@ |
virtual SkTypeface* onCreateFromStream(SkStreamAsset*, int ttcIndex) const = 0; |
// TODO: make pure virtual. |
virtual SkTypeface* onCreateFromStream(SkStreamAsset*, const FontParameters&) const; |
- virtual SkTypeface* onCreateFromFontData(std::unique_ptr<SkFontData>) const; |
+ virtual SkTypeface* onCreateFromFontData(SkFontData*) const; |
virtual SkTypeface* onCreateFromFile(const char path[], int ttcIndex) const = 0; |
virtual SkTypeface* onLegacyCreateTypeface(const char familyName[], SkFontStyle) const = 0; |