| 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 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 49 , fIdentity(fi) | 49 , fIdentity(fi) |
| 50 , fFamilyName(familyName) | 50 , fFamilyName(familyName) |
| 51 , fLocalStream(NULL) {} | 51 , fLocalStream(NULL) {} |
| 52 | 52 |
| 53 FontConfigTypeface(const SkFontStyle& style, bool fixedWidth, SkStreamAsset*
localStream) | 53 FontConfigTypeface(const SkFontStyle& style, bool fixedWidth, SkStreamAsset*
localStream) |
| 54 : INHERITED(style, SkTypefaceCache::NewFontID(), fixedWidth) | 54 : INHERITED(style, SkTypefaceCache::NewFontID(), fixedWidth) |
| 55 , fLocalStream(localStream) { | 55 , fLocalStream(localStream) { |
| 56 // we default to empty fFamilyName and fIdentity | 56 // we default to empty fFamilyName and fIdentity |
| 57 } | 57 } |
| 58 | 58 |
| 59 void onGetFamilyName(SkString* familyName) const SK_OVERRIDE; | 59 void onGetFamilyName(SkString* familyName) const override; |
| 60 void onGetFontDescriptor(SkFontDescriptor*, bool*) const SK_OVERRIDE; | 60 void onGetFontDescriptor(SkFontDescriptor*, bool*) const override; |
| 61 SkStreamAsset* onOpenStream(int* ttcIndex) const SK_OVERRIDE; | 61 SkStreamAsset* onOpenStream(int* ttcIndex) const override; |
| 62 | 62 |
| 63 private: | 63 private: |
| 64 typedef SkTypeface_FreeType INHERITED; | 64 typedef SkTypeface_FreeType INHERITED; |
| 65 }; | 65 }; |
| OLD | NEW |