diff --git a/txt/src/txt/platform.cc b/txt/src/txt/platform.cc index 3e8fd2336cccafd1d28c5c8bb800872f4ec726af..95a3007dedc56307220cd09a85cd2f497a784c87 100644 --- a/txt/src/txt/platform.cc +++ b/txt/src/txt/platform.cc @@ -26,9 +26,15 @@ std::vector GetDefaultFontFamilies() { } #endif +#ifndef USE_ROSEN_DRAWING sk_sp GetDefaultFontManager() { return SkFontMgr::RefDefault(); } +#else +std::shared_ptr GetDefaultFontManager() { + return RSFontMgr::CreateDefaultFontMgr(); +} +#endif FontManagerType GetDefaultFontManagerType() { return FontManagerType::DEFAULT_OHOS; diff --git a/txt/src/txt/platform_linux.cc b/txt/src/txt/platform_linux.cc index 04c6f80be95af91fea30b9fa2db0f997a774205a..7c8a67689c29567e0a4cb62a551afbdb6ae5ad19 100644 --- a/txt/src/txt/platform_linux.cc +++ b/txt/src/txt/platform_linux.cc @@ -33,6 +33,8 @@ std::vector GetDefaultFontFamilies() { return {"Ubuntu", "Cantarell", "DejaVu Sans", "Liberation Sans", "Arial"}; } #endif + +#ifndef USE_ROSEN_DRAWING sk_sp GetDefaultFontManager() { #ifdef SK_BUILD_FONT_MGR_FOR_PREVIEW_LINUX @@ -43,5 +45,11 @@ sk_sp GetDefaultFontManager() return SkFontMgr_New_Custom_Directory("/usr/share/fonts/"); #endif } +#else +std::shared_ptr GetDefaultFontManager() +{ + return RSFontMgr::CreateDefaultFontMgr(); +} +#endif } // namespace txt diff --git a/txt/src/txt/platform_mac.mm b/txt/src/txt/platform_mac.mm index 13ab64a90284c0d7dcb48fa8ece501608a5e50bb..943d9942966d8a231ecff86aeef8f8fbf4b8ac27 100644 --- a/txt/src/txt/platform_mac.mm +++ b/txt/src/txt/platform_mac.mm @@ -45,8 +45,13 @@ std::vector GetDefaultFontFamilies() { } #endif +#ifndef USE_ROSEN_DRAWING sk_sp GetDefaultFontManager() { return SkFontMgr::RefDefault(); } - +#else +std::shared_ptr GetDefaultFontManager() { + return RSFontMgr::CreateDefaultFontMgr(); +} +#endif } // namespace txt