aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/core/SkTypeface.h7
-rw-r--r--src/core/SkTypeface.cpp4
-rw-r--r--src/fonts/SkGScalerContext.cpp4
-rw-r--r--src/ports/SkFontHost_FreeType.cpp2
-rw-r--r--src/ports/SkFontHost_FreeType_common.h2
-rwxr-xr-xsrc/ports/SkFontHost_mac.cpp4
-rwxr-xr-xsrc/ports/SkFontHost_win.cpp4
-rw-r--r--src/ports/SkFontHost_win_dw.cpp4
-rw-r--r--tests/FontNamesTest.cpp3
9 files changed, 16 insertions, 18 deletions
diff --git a/include/core/SkTypeface.h b/include/core/SkTypeface.h
index ca88a1bc76..a2bef4b40f 100644
--- a/include/core/SkTypeface.h
+++ b/include/core/SkTypeface.h
@@ -233,14 +233,13 @@ public:
public:
virtual ~LocalizedStrings() { }
virtual bool next(LocalizedString* localizedString) = 0;
- void unref() { SkDELETE(this); }
};
/**
* Returns an iterator which will attempt to enumerate all of the
* family names specified by the font.
- * It is the caller's responsibility to unref() the returned pointer.
+ * It is the caller's responsibility to SK_DELETE the returned pointer.
*/
- LocalizedStrings* createFamilyNameIterator() const;
+ LocalizedStrings* getFamilyNames() const;
/**
* Return the family name for this typeface. It will always be returned
@@ -312,7 +311,7 @@ protected:
virtual int onGetUPEM() const = 0;
- virtual LocalizedStrings* onCreateFamilyNameIterator() const = 0;
+ virtual LocalizedStrings* onGetFamilyNames() const = 0;
virtual int onGetTableTags(SkFontTableTag tags[]) const = 0;
virtual size_t onGetTableData(SkFontTableTag, size_t offset,
diff --git a/src/core/SkTypeface.cpp b/src/core/SkTypeface.cpp
index dbe0f603b2..507c1bf2a6 100644
--- a/src/core/SkTypeface.cpp
+++ b/src/core/SkTypeface.cpp
@@ -194,8 +194,8 @@ int SkTypeface::getUnitsPerEm() const {
return this->onGetUPEM();
}
-SkTypeface::LocalizedStrings* SkTypeface::createFamilyNameIterator() const {
- return this->onCreateFamilyNameIterator();
+SkTypeface::LocalizedStrings* SkTypeface::getFamilyNames() const {
+ return this->onGetFamilyNames();
}
void SkTypeface::getFamilyName(SkString* name) const {
diff --git a/src/fonts/SkGScalerContext.cpp b/src/fonts/SkGScalerContext.cpp
index 2c4ebe508d..34a55e6d31 100644
--- a/src/fonts/SkGScalerContext.cpp
+++ b/src/fonts/SkGScalerContext.cpp
@@ -202,8 +202,8 @@ int SkGTypeface::onGetUPEM() const {
return fProxy->getUnitsPerEm();
}
-SkTypeface::LocalizedStrings* SkGTypeface::onCreateFamilyNameIterator() const {
- return fProxy->createFamilyNameIterator();
+SkTypeface::LocalizedStrings* SkGTypeface::onGetFamilyNames() const {
+ return fProxy->getFamilyNames();
}
int SkGTypeface::onGetTableTags(SkFontTableTag tags[]) const {
diff --git a/src/ports/SkFontHost_FreeType.cpp b/src/ports/SkFontHost_FreeType.cpp
index 3a8a1ae207..c5542a9ddf 100644
--- a/src/ports/SkFontHost_FreeType.cpp
+++ b/src/ports/SkFontHost_FreeType.cpp
@@ -1403,7 +1403,7 @@ int SkTypeface_FreeType::onCountGlyphs() const {
return fGlyphCount;
}
-SkTypeface::LocalizedStrings* SkTypeface_FreeType::onCreateFamilyNameIterator() const {
+SkTypeface::LocalizedStrings* SkTypeface_FreeType::onGetFamilyNames() const {
SkTypeface::LocalizedStrings* nameIter =
SkOTUtils::LocalizedStrings_NameTable::CreateForFamilyNames(*this);
if (NULL == nameIter) {
diff --git a/src/ports/SkFontHost_FreeType_common.h b/src/ports/SkFontHost_FreeType_common.h
index c0f2dc7553..5c069d042d 100644
--- a/src/ports/SkFontHost_FreeType_common.h
+++ b/src/ports/SkFontHost_FreeType_common.h
@@ -64,7 +64,7 @@ protected:
int glyphCount) const SK_OVERRIDE;
virtual int onCountGlyphs() const SK_OVERRIDE;
- virtual LocalizedStrings* onCreateFamilyNameIterator() const SK_OVERRIDE;
+ virtual LocalizedStrings* onGetFamilyNames() const SK_OVERRIDE;
virtual int onGetTableTags(SkFontTableTag tags[]) const SK_OVERRIDE;
virtual size_t onGetTableData(SkFontTableTag, size_t offset,
diff --git a/src/ports/SkFontHost_mac.cpp b/src/ports/SkFontHost_mac.cpp
index 987f185101..9600730f67 100755
--- a/src/ports/SkFontHost_mac.cpp
+++ b/src/ports/SkFontHost_mac.cpp
@@ -454,7 +454,7 @@ protected:
virtual int onGetUPEM() const SK_OVERRIDE;
virtual SkStream* onOpenStream(int* ttcIndex) const SK_OVERRIDE;
- virtual SkTypeface::LocalizedStrings* onCreateFamilyNameIterator() const SK_OVERRIDE;
+ virtual SkTypeface::LocalizedStrings* onGetFamilyNames() const SK_OVERRIDE;
virtual int onGetTableTags(SkFontTableTag tags[]) const SK_OVERRIDE;
virtual size_t onGetTableData(SkFontTableTag, size_t offset,
size_t length, void* data) const SK_OVERRIDE;
@@ -1750,7 +1750,7 @@ int SkTypeface_Mac::onGetUPEM() const {
return CGFontGetUnitsPerEm(cgFont);
}
-SkTypeface::LocalizedStrings* SkTypeface_Mac::onCreateFamilyNameIterator() const {
+SkTypeface::LocalizedStrings* SkTypeface_Mac::onGetFamilyNames() const {
SkTypeface::LocalizedStrings* nameIter =
SkOTUtils::LocalizedStrings_NameTable::CreateForFamilyNames(*this);
if (NULL == nameIter) {
diff --git a/src/ports/SkFontHost_win.cpp b/src/ports/SkFontHost_win.cpp
index 708c66fdf7..d52774ca6d 100755
--- a/src/ports/SkFontHost_win.cpp
+++ b/src/ports/SkFontHost_win.cpp
@@ -268,7 +268,7 @@ protected:
virtual void onGetFontDescriptor(SkFontDescriptor*, bool*) const SK_OVERRIDE;
virtual int onCountGlyphs() const SK_OVERRIDE;
virtual int onGetUPEM() const SK_OVERRIDE;
- virtual SkTypeface::LocalizedStrings* onCreateFamilyNameIterator() const SK_OVERRIDE;
+ virtual SkTypeface::LocalizedStrings* onGetFamilyNames() const SK_OVERRIDE;
virtual int onGetTableTags(SkFontTableTag tags[]) const SK_OVERRIDE;
virtual size_t onGetTableData(SkFontTableTag, size_t offset,
size_t length, void* data) const SK_OVERRIDE;
@@ -2056,7 +2056,7 @@ int LogFontTypeface::onGetUPEM() const {
return upem;
}
-SkTypeface::LocalizedStrings* LogFontTypeface::onCreateFamilyNameIterator() const {
+SkTypeface::LocalizedStrings* LogFontTypeface::onGetFamilyNames() const {
SkTypeface::LocalizedStrings* nameIter =
SkOTUtils::LocalizedStrings_NameTable::CreateForFamilyNames(*this);
if (NULL == nameIter) {
diff --git a/src/ports/SkFontHost_win_dw.cpp b/src/ports/SkFontHost_win_dw.cpp
index 5df90b47f3..cee8b362b2 100644
--- a/src/ports/SkFontHost_win_dw.cpp
+++ b/src/ports/SkFontHost_win_dw.cpp
@@ -495,7 +495,7 @@ protected:
virtual void onGetFontDescriptor(SkFontDescriptor*, bool*) const SK_OVERRIDE;
virtual int onCountGlyphs() const SK_OVERRIDE;
virtual int onGetUPEM() const SK_OVERRIDE;
- virtual SkTypeface::LocalizedStrings* onCreateFamilyNameIterator() const SK_OVERRIDE;
+ virtual SkTypeface::LocalizedStrings* onGetFamilyNames() const SK_OVERRIDE;
virtual int onGetTableTags(SkFontTableTag tags[]) const SK_OVERRIDE;
virtual size_t onGetTableData(SkFontTableTag, size_t offset,
size_t length, void* data) const SK_OVERRIDE;
@@ -1130,7 +1130,7 @@ private:
SkTScopedComPtr<IDWriteLocalizedStrings> fStrings;
};
-SkTypeface::LocalizedStrings* DWriteFontTypeface::onCreateFamilyNameIterator() const {
+SkTypeface::LocalizedStrings* DWriteFontTypeface::onGetFamilyNames() const {
SkTScopedComPtr<IDWriteLocalizedStrings> familyNames;
HRNM(fDWriteFontFamily->GetFamilyNames(&familyNames), "Could not obtain family names.");
diff --git a/tests/FontNamesTest.cpp b/tests/FontNamesTest.cpp
index 210a7cf310..ee0a1169f3 100644
--- a/tests/FontNamesTest.cpp
+++ b/tests/FontNamesTest.cpp
@@ -164,8 +164,7 @@ static void test_systemfonts(skiatest::Reporter* reporter, bool verbose) {
printf("[%s]\n", familyName.c_str());
}
- SkAutoTUnref<SkTypeface::LocalizedStrings> familyNamesIter(
- typeface->createFamilyNameIterator());
+ SkAutoTDelete<SkTypeface::LocalizedStrings> familyNamesIter(typeface->getFamilyNames());
SkTypeface::LocalizedString familyNameLocalized;
while (familyNamesIter->next(&familyNameLocalized)) {
if (verbose) {
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-07 18:43:52 +0000