Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Replace calls to SkFontMgr::RefDefault #48179

Merged
kjlubick merged 4 commits into from
Nov 20, 2023
Merged

Replace calls to SkFontMgr::RefDefault #48179

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2e2ddae
Replace RefDefault with txt::GetDefaultFontFamilies
kjlubick Nov 17, 2023
d174216
format
kjlubick Nov 17, 2023
700b7fa
try fixes
kjlubick Nov 17, 2023
0fd658c
re-implement in skwasm
kjlubick Nov 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
re-implement in skwasm
  • Loading branch information
@kjlubick
kjlubick committed Nov 17, 2023
commit 0fd658c0126905759397e29f7b975b2f89864b8f
10 changes: 7 additions & 3 deletions lib/web_ui/skwasm/fonts.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@

#include "export.h"
#include "third_party/skia/include/core/SkFontMgr.h"
#include "third_party/skia/include/ports/SkFontMgr_empty.h"
#include "third_party/skia/modules/skparagraph/include/FontCollection.h"
#include "third_party/skia/modules/skparagraph/include/TypefaceFontProvider.h"
#include "third_party/txt/platform.h"
#include "wrappers.h"

#include <memory>
Expand All @@ -29,9 +29,13 @@ SKWASM_EXPORT void fontCollection_dispose(FlutterFontCollection* collection) {
delete collection;
}

static sk_sp<SkFontMgr> default_fontmgr() {
static sk_sp<SkFontMgr> mgr = SkFontMgr_New_Custom_Empty();
return mgr;
}

SKWASM_EXPORT SkTypeface* typeface_create(SkData* fontData) {
auto typeface =
txt::GetDefaultFontManager()->makeFromData(sk_ref_sp<SkData>(fontData));
auto typeface = default_fontmgr()->makeFromData(sk_ref_sp<SkData>(fontData));
return typeface.release();
}

Expand Down