diff options
| author |  reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-03-21 13:38:18 +0000 |
|---|---|---|
| committer | reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-03-21 13:38:18 +0000 |
| commit | 032fbb8ebff7816793b077b6113de702e48713c1 (patch) | |
| tree | f79a1d70eded7b4c8c75f9d77302e8e3bc2d59cc | |
| parent | 0fc17c33f144956bb75650f991226a14e555f189 (diff) | |
oops, update the INHERITED for our typeface
git-svn-id: http://skia.googlecode.com/svn/trunk@8289 2bbb7eff-a529-9590-31e7-b0007b416f81
| -rw-r--r-- | src/ports/SkFontHost_linux.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/ports/SkFontHost_linux.cpp b/src/ports/SkFontHost_linux.cpp index 9fa80601f4..d4840d863c 100644 --- a/src/ports/SkFontHost_linux.cpp +++ b/src/ports/SkFontHost_linux.cpp @@ -232,7 +232,7 @@ static void remove_from_names(FamilyRec* emptyFamily) { class FamilyTypeface : public SkTypeface_FreeType { public: FamilyTypeface(Style style, bool sysFont, FamilyRec* family, bool isFixedWidth) - : SkTypeface(style, sk_atomic_inc(&gUniqueFontID) + 1, isFixedWidth) { + : INHERITED(style, sk_atomic_inc(&gUniqueFontID) + 1, isFixedWidth) { fIsSysFont = sysFont; SkAutoMutexAcquire ac(gFamilyMutex); @@ -266,7 +266,7 @@ private: FamilyRec* fFamilyRec; // we don't own this, just point to it bool fIsSysFont; - typedef SkTypeface INHERITED; + typedef SkTypeface_FreeType INHERITED; }; /////////////////////////////////////////////////////////////////////////////// |