diff --git a/skia/src/ports/SkFontMgr_custom_directory_factory.cpp b/skia/src/ports/SkFontMgr_custom_directory_factory.cpp index 0b173c3adbf00f57abb92c58da6d11ed5528bdd3..ecbecc85fe525ea2343c25ce31cc4169f4d567b8 100644 --- a/skia/src/ports/SkFontMgr_custom_directory_factory.cpp +++ b/skia/src/ports/SkFontMgr_custom_directory_factory.cpp @@ -21,12 +21,12 @@ SK_API sk_sp SkFontMgr_New_OHOS(const char *path); sk_sp SkFontMgr::Factory() { - if (SkFontMgr::runtimeOS == "OHOS") { - return SkFontMgr_New_OHOS(nullptr); - } - if (SkFontMgr::runtimeOS == "OHOS_Container") { - return SkFontMgr_New_Preview(); - } + // if (SkFontMgr::runtimeOS == "OHOS") { + // return SkFontMgr_New_OHOS(nullptr); + // } + // if (SkFontMgr::runtimeOS == "OHOS_Container") { + // return SkFontMgr_New_Preview(); + // } return SkFontMgr_New_Custom_Directory(SK_FONT_FILE_PREFIX); } #else diff --git a/skia/src/ports/SkFontMgr_win_factory.cpp b/skia/src/ports/SkFontMgr_win_factory.cpp index b90967f60e46e938ba7f24ea4c37a0247a955edf..158de838a880f9381a40d956fa596909c1db1f03 100644 --- a/skia/src/ports/SkFontMgr_win_factory.cpp +++ b/skia/src/ports/SkFontMgr_win_factory.cpp @@ -17,11 +17,11 @@ SK_API sk_sp SkFontMgr_New_OHOS(const char *path); sk_sp SkFontMgr::Factory() { - if (SkFontMgr::runtimeOS == "OHOS") { - return SkFontMgr_New_OHOS(nullptr); - } - if (SkFontMgr::runtimeOS == "OHOS_Container") { - return SkFontMgr_New_Preview(); - } + // if (SkFontMgr::runtimeOS == "OHOS") { + // return SkFontMgr_New_OHOS(nullptr); + // } + // if (SkFontMgr::runtimeOS == "OHOS_Container") { + // return SkFontMgr_New_Preview(); + // } return SkFontMgr_New_DirectWrite(); } \ No newline at end of file