aboutsummaryrefslogtreecommitdiffhomepage
path: root/include/ports/SkFontConfigInterface.h
diff options
context:
space:
mode:
authorGravatar reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-04-19 20:45:30 +0000
committerGravatar reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-04-19 20:45:30 +0000
commit027fd204ad09fe3160c7319b1e55c4ae44747947 (patch)
treefd16e8b0f1416265074eeb6ce5bd2c5e21525f09 /include/ports/SkFontConfigInterface.h
parent3cceb9f400583be4ec70da526c23fe81b68dc6ee (diff)
use SkDataTable to return familyNames for fontmgr
git-svn-id: http://skia.googlecode.com/svn/trunk@8781 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include/ports/SkFontConfigInterface.h')
-rw-r--r--include/ports/SkFontConfigInterface.h15
1 files changed, 7 insertions, 8 deletions
diff --git a/include/ports/SkFontConfigInterface.h b/include/ports/SkFontConfigInterface.h
index e9d3f6ccd8..786c3468db 100644
--- a/include/ports/SkFontConfigInterface.h
+++ b/include/ports/SkFontConfigInterface.h
@@ -8,8 +8,10 @@
#ifndef SkFontConfigInterface_DEFINED
#define SkFontConfigInterface_DEFINED
+#include "SkDataTable.h"
#include "SkFontStyle.h"
#include "SkRefCnt.h"
+#include "SkTArray.h"
#include "SkTypeface.h"
/**
@@ -86,14 +88,11 @@ public:
// New APIS, which have default impls for now (which do nothing)
- virtual int countFamilies() { return 0; };
- virtual int getFamilySet(int index, SkString* outFamilyName,
- FontIdentity outIdentities[], int maxCount) {
- return 0;
- }
- virtual int matchFamilySet(const char familyName[], SkString* outFamilyName,
- FontIdentity outIdentities[], int maxCount) {
- return 0;
+ virtual SkDataTable* getFamilyNames() { return SkDataTable::NewEmpty(); }
+ virtual bool matchFamilySet(const char inFamilyName[],
+ SkString* outFamilyName,
+ SkTArray<FontIdentity>*) {
+ return false;
}
};