| 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 "SkFontDescriptor.h" | 9 #include "SkFontDescriptor.h" |
| 10 #include "SkFontHost_FreeType_common.h" | 10 #include "SkFontHost_FreeType_common.h" |
| (...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 53 : INHERITED(style, isFixedPitch) | 53 : INHERITED(style, isFixedPitch) |
| 54 , fFontData(std::move(data)) | 54 , fFontData(std::move(data)) |
| 55 { | 55 { |
| 56 SkASSERT(fFontData); | 56 SkASSERT(fFontData); |
| 57 fIdentity.fTTCIndex = fFontData->getIndex(); | 57 fIdentity.fTTCIndex = fFontData->getIndex(); |
| 58 } | 58 } |
| 59 | 59 |
| 60 void onGetFamilyName(SkString* familyName) const override { *familyName = fF
amilyName; } | 60 void onGetFamilyName(SkString* familyName) const override { *familyName = fF
amilyName; } |
| 61 void onGetFontDescriptor(SkFontDescriptor*, bool*) const override; | 61 void onGetFontDescriptor(SkFontDescriptor*, bool*) const override; |
| 62 SkStreamAsset* onOpenStream(int* ttcIndex) const override; | 62 SkStreamAsset* onOpenStream(int* ttcIndex) const override; |
| 63 std::unique_ptr<SkFontData> onMakeFontData() const override; | 63 SkFontData* onCreateFontData() const override; |
| 64 | 64 |
| 65 private: | 65 private: |
| 66 typedef SkTypeface_FreeType INHERITED; | 66 typedef SkTypeface_FreeType INHERITED; |
| 67 }; | 67 }; |
| OLD | NEW |