| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright 2013 Google Inc. | 2 * Copyright 2013 Google Inc. |
| 3 * | 3 * |
| 4 * Use of this source code is governed by a BSD-style license that can be | 4 * Use of this source code is governed by a BSD-style license that can be |
| 5 * found in the LICENSE file. | 5 * found in the LICENSE file. |
| 6 */ | 6 */ |
| 7 | 7 |
| 8 #include "SkFontConfigInterface.h" | 8 #include "SkFontConfigInterface.h" |
| 9 #include "SkFontHost_FreeType_common.h" | 9 #include "SkFontHost_FreeType_common.h" |
| 10 #include "SkStream.h" | 10 #include "SkStream.h" |
| (...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 58 , fFamilyName(familyName) | 58 , fFamilyName(familyName) |
| 59 , fLocalStream(NULL) {} | 59 , fLocalStream(NULL) {} |
| 60 | 60 |
| 61 FontConfigTypeface(Style style, bool fixedWidth, SkStream* localStream) | 61 FontConfigTypeface(Style style, bool fixedWidth, SkStream* localStream) |
| 62 : INHERITED(style, SkTypefaceCache::NewFontID(), fixedWidth) { | 62 : INHERITED(style, SkTypefaceCache::NewFontID(), fixedWidth) { |
| 63 // we default to empty fFamilyName and fIdentity | 63 // we default to empty fFamilyName and fIdentity |
| 64 fLocalStream = localStream; | 64 fLocalStream = localStream; |
| 65 SkSafeRef(localStream); | 65 SkSafeRef(localStream); |
| 66 } | 66 } |
| 67 | 67 |
| 68 virtual void onGetFamilyName(SkString* familyName) const SK_OVERRIDE; |
| 68 virtual void onGetFontDescriptor(SkFontDescriptor*, bool*) const SK_OVERRIDE
; | 69 virtual void onGetFontDescriptor(SkFontDescriptor*, bool*) const SK_OVERRIDE
; |
| 69 virtual SkStream* onOpenStream(int* ttcIndex) const SK_OVERRIDE; | 70 virtual SkStream* onOpenStream(int* ttcIndex) const SK_OVERRIDE; |
| 70 | 71 |
| 71 private: | 72 private: |
| 72 typedef SkTypeface_FreeType INHERITED; | 73 typedef SkTypeface_FreeType INHERITED; |
| 73 }; | 74 }; |
| OLD | NEW |