Skip to content

Commit f69e408

Browse files
Mike KleinSkia Commit-Bot
authored andcommitted
move dummy onMakeFromFontData() into .cpp
It's borderline illegal to implement it there in the header with a forward-declared SkFontData. See also cl/314969840. Change-Id: I81e981198014cce03fa9604aada5a383a847cfeb Reviewed-on: https://skia-review.googlesource.com/c/skia/+/295640 Reviewed-by: 🤓Vy Nguyen <vyng@google.com> Commit-Queue: Mike Klein <mtklein@google.com>
1 parent 56bf90b commit f69e408

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

modules/skparagraph/include/TypefaceFontProvider.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,7 @@ class TypefaceFontProvider : public SkFontMgr {
6767
const SkFontArguments&) const override {
6868
return nullptr;
6969
}
70-
sk_sp<SkTypeface> onMakeFromFontData(std::unique_ptr<SkFontData>) const override {
71-
return nullptr;
72-
}
70+
sk_sp<SkTypeface> onMakeFromFontData(std::unique_ptr<SkFontData>) const override;
7371
sk_sp<SkTypeface> onMakeFromFile(const char path[], int ttcIndex) const override {
7472
return nullptr;
7573
}

modules/skparagraph/src/TypefaceFontProvider.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,10 @@ SkFontStyleSet* TypefaceFontProvider::onMatchFamily(const char familyName[]) con
2424
return nullptr;
2525
}
2626

27+
sk_sp<SkTypeface> TypefaceFontProvider::onMakeFromFontData(std::unique_ptr<SkFontData>) const {
28+
return nullptr;
29+
}
30+
2731
size_t TypefaceFontProvider::registerTypeface(sk_sp<SkTypeface> typeface) {
2832
if (typeface == nullptr) {
2933
return 0;

0 commit comments

Comments
 (0)