aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/fonts/SkGScalerContext.cpp
diff options
context:
space:
mode:
authorGravatar robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-08-07 15:56:51 +0000
committerGravatar robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-08-07 15:56:51 +0000
commitf7af91bd79daf7e090bd6ae1d080ad7a4964e477 (patch)
tree0be8e8411705ba7bf2d1327a46785d30a4c81c1a /src/fonts/SkGScalerContext.cpp
parent246b1c266f2b0111aa58016829cf17de82614803 (diff)
Reverting r10608 (Add getFamilyNames to SkTypeface) due to compilation failures
git-svn-id: http://skia.googlecode.com/svn/trunk@10609 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/fonts/SkGScalerContext.cpp')
-rw-r--r--src/fonts/SkGScalerContext.cpp4
1 files changed, 2 insertions, 2 deletions
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 {