[Optimize][Harmony] Enable global font collection by default

- Remove the Harmony runtime setting that toggled global font collection.
- Always use the shared Harmony global font collection and global-family font key path.
- Drop legacy system-font preload branches that were only needed when the setting was disabled.

TEST: tools/env.sh ninja -C out/harmony_debug_profile_arm64 lynx/platform/harmony/lynx_harmony/src/main/cpp:cpp
TEST: tools/env.sh ninja -C out/harmony_debug_profile_arm64 lynx/core/renderer/utils:lynx_env

Author: linxs0211

core/renderer/utils/lynx_env.cc

@@ -550,12 +550,6 @@ bool LynxEnv::FixRadonTransitionPropertyRemoveBug() {
   return fix_radon_transition_property_remove_bug;
 }
 
-bool LynxEnv::EnableGlobalFontCollection() {
-  static bool enable_global_font_collection =
-      GetBoolEnv(Key::ENABLE_GLOBAL_FONT_COLLECTION, true);
-  return enable_global_font_collection;
-}
-
 uint32_t LynxEnv::EnableGCOnceOnIdle() {
   static uint32_t cached_enable_gc_once_on_idle =
       static_cast<uint32_t>(GetLongEnv(Key::ENABLE_GC_ONCE_ON_IDLE, 0));

core/renderer/utils/lynx_env.h

@@ -122,7 +122,6 @@ class LYNX_EXPORT_FOR_DEVTOOL LynxEnv {
     FIX_OLD_FIXED_INSERT_SELF_USE_RENDER_PARENT,
     FIX_FIBER_REINSERT_DETACH_FROM_OLD_RENDER_PARENT,
     FIX_FILTER_DYNAMIC_UPDATE_BUG,
-    ENABLE_GLOBAL_FONT_COLLECTION,
     ENABLE_GC_ONCE_ON_IDLE,
     ENABLE_CSS_INLINE_VARIABLES,
     ENABLE_OPTIMIZE_HAS_OPACITY,
@@ -293,8 +292,6 @@ class LYNX_EXPORT_FOR_DEVTOOL LynxEnv {
              "disable_list_callback_if_detached"},
             {Key::FIX_RADON_TRANSITION_PROPERTY_REMOVE_BUG,
              "fix_radon_transition_property_remove_bug"},
-            {Key::ENABLE_GLOBAL_FONT_COLLECTION,
-             "enable_global_font_collection"},
             {Key::ENABLE_GC_ONCE_ON_IDLE, "enable_gc_once_on_idle"},
             {Key::ENABLE_CSS_INLINE_VARIABLES, "enable_css_inline_variables"},
             {Key::ENABLE_OPTIMIZE_HAS_OPACITY, "enable_optimize_has_opacity"},
@@ -485,7 +482,6 @@ class LYNX_EXPORT_FOR_DEVTOOL LynxEnv {
   bool EnableDecoupledList();
   bool DisableListCallbackIfDetached();
   bool FixRadonTransitionPropertyRemoveBug();
-  bool EnableGlobalFontCollection();
   uint32_t EnableGCOnceOnIdle();
   bool EnableCSSInlineVariables();
   bool EnableOptimizeHasOpacity();

platform/harmony/lynx_harmony/src/main/cpp/font/font_face_manager.cc

@@ -62,12 +62,8 @@ void FontFace::ParseAndAddSrc(const std::string& src) {
       }
 
       std::string url = item.substr(start_pos, end_pos - start_pos + 1);
-      // if enable global font collection,we need to use font_family+ur.hash to
-      // make a unique key!
       std::string unique_key =
-          LynxEnv::GetInstance().EnableGlobalFontCollection()
-              ? (font_family_ + std::to_string(std::hash<std::string>{}(url)))
-              : font_family_;
+          font_family_ + std::to_string(std::hash<std::string>{}(url));
       src_data_.emplace_back(
           FontSrcData{type, std::move(url), std::move(unique_key)});
     }

platform/harmony/lynx_harmony/src/main/cpp/font/font_face_manager.h

@@ -79,8 +79,7 @@ using FontResourceCallback =
 using FontPrefetchCallback = base::MoveOnlyClosure<void, int32_t, std::string>;
 class FontFaceManager : public std::enable_shared_from_this<FontFaceManager> {
  public:
-  explicit FontFaceManager(ShadowNodeOwner* node_owner,
-                           bool enable_global_font_collection = false)
+  explicit FontFaceManager(ShadowNodeOwner* node_owner)
       : node_owner_(node_owner),
         font_collection_(
             FontCollectionHarmony::MakeSharedFontCollectionHarmony()) {}

platform/harmony/lynx_harmony/src/main/cpp/lynx_template_renderer.cc

@@ -35,7 +35,6 @@
 #include "core/shell/runtime/bts/lynx_bts_runtime_proxy_impl.h"
 #include "core/shell/runtime/common/module_delegate_impl.h"
 #include "platform/harmony/lynx_harmony/src/main/cpp/base/base_trace_backend.h"
-#include "platform/harmony/lynx_harmony/src/main/cpp/font/system_font_manager.h"
 #include "platform/harmony/lynx_harmony/src/main/cpp/lynx_white_board_harmony.h"
 #include "platform/harmony/lynx_harmony/src/main/cpp/ui/ui_new_image.h"
 
@@ -693,13 +692,6 @@ napi_value LynxTemplateRenderer::InitGlobalEnv(napi_env env,
         OH_ResourceManager_InitNativeResourceManager(env, args[0]);
   });
 
-  // try to load system font
-  if (!tasm::LynxEnv::GetInstance().EnableGlobalFontCollection()) {
-    tasm::harmony::SystemFontManager::GetInstance().GetSystemFont(
-        env, [](std::string font_family, std::string font_path) {
-          LOGI("GetSystemFont when InitGlobalEnv!")
-        });
-  }
   return nullptr;
 }
 

platform/harmony/lynx_harmony/src/main/cpp/shadow_node/base_text_shadow_node.cc

@@ -117,10 +117,15 @@ void BaseTextShadowNode::OnPropsUpdate(const std::string& name,
 
 void BaseTextShadowNode::SetCustomFontFamiliesToStyle() {
   if (!raw_font_families_.empty() && style_.GetCustomFontFamilies().empty()) {
-    std::vector<std::string> new_custom_families =
-        context_->GetFontFaceManager()->GetCustomFamiliesFromRawVector(
-            raw_font_families_);
-    style_.SetCustomFontFamilyVector(std::move(new_custom_families));
+    const auto font_manager =
+        context_ ? context_->GetFontFaceManager() : nullptr;
+    if (font_manager) {
+      std::vector<std::string> new_custom_families =
+          font_manager->GetCustomFamiliesFromRawVector(raw_font_families_);
+      style_.SetCustomFontFamilyVector(std::move(new_custom_families));
+    } else {
+      style_.SetCustomFontFamilyVector(raw_font_families_);
+    }
   }
 }
 
@@ -141,8 +146,6 @@ void BaseTextShadowNode::UpdateInheritedTextStyle(
     } else {
       style_.SetCustomFontFamilyVector({});
     }
-  } else if (!LynxEnv::GetInstance().EnableGlobalFontCollection()) {
-    style_.SetCustomFontFamilyVector(effective_raw_font_families);
   } else {
     const auto font_manager =
         context_ ? context_->GetFontFaceManager() : nullptr;
@@ -201,13 +204,7 @@ void BaseTextShadowNode::AppendToParagraph(ParagraphBuilderHarmony& builder,
   style_.UpdateTextPaint(width, height, context_->ScaledDensity());
 
   // we need to set font families before PushTextStyle!
-  if (!LynxEnv::GetInstance().EnableGlobalFontCollection()) {
-    if (!raw_font_families_.empty()) {
-      style_.SetCustomFontFamilyVector(raw_font_families_);
-    }
-  } else {
-    SetCustomFontFamiliesToStyle();
-  }
+  SetCustomFontFamiliesToStyle();
 
   builder.PushTextStyle(style_);
   OnAppendToParagraph(builder, width, height);

platform/harmony/lynx_harmony/src/main/cpp/shadow_node/shadow_node_owner.cc

@@ -43,8 +43,7 @@ void LayoutVSyncProxy::SetLayoutTriggerCallback(base::closure callback) {
 
 ShadowNodeOwner::ShadowNodeOwner()
     : text_measure_cache_(new TextMeasureCache),
-      font_face_manager_(new FontFaceManager(
-          this, LynxEnv::GetInstance().EnableGlobalFontCollection())) {}
+      font_face_manager_(new FontFaceManager(this)) {}
 
 // delete the reference to release the object in js.
 ShadowNodeOwner::~ShadowNodeOwner() = default;
@@ -81,11 +80,6 @@ void ShadowNodeOwner::SetContext(const std::shared_ptr<LynxContext>& context) {
   context_ = context;
 
   font_face_manager_->SetLayoutTaskRunner(context->GetLayoutTaskRunner());
-  if (!LynxEnv::GetInstance().EnableGlobalFontCollection()) {
-    // ty to load system font when Init ShadowNodeOwner
-    // FIXME(linxs): need to fetch system font when system font updated later
-    font_face_manager_->TryFetchSystemFont(env_);
-  }
 }
 
 void ShadowNodeOwner::SetLayoutNodeManager(

platform/harmony/lynx_harmony/src/main/cpp/text/font_collection_harmony.h

@@ -19,7 +19,6 @@
 #include "base/include/log/logging.h"
 #include "core/base/harmony/harmony_function_loader.h"
 #include "core/base/threading/task_runner_manufactor.h"
-#include "core/renderer/utils/lynx_env.h"
 
 namespace lynx {
 namespace tasm {
@@ -53,16 +52,10 @@ class FontCollectionHarmony
 
   static std::shared_ptr<FontCollectionHarmony>
   MakeSharedFontCollectionHarmony() {
-    bool enable_global_font_collection =
-        LynxEnv::GetInstance().EnableGlobalFontCollection();
-    if (enable_global_font_collection) {
-      static std::shared_ptr<FontCollectionHarmony>
-          gGlobalFontCollectionHarmony_ =
-              std::make_shared<FontCollectionHarmony>(true);
-      return gGlobalFontCollectionHarmony_;
-    } else {
-      return std::make_shared<FontCollectionHarmony>(false);
-    }
+    static std::shared_ptr<FontCollectionHarmony>
+        gGlobalFontCollectionHarmony_ =
+            std::make_shared<FontCollectionHarmony>(true);
+    return gGlobalFontCollectionHarmony_;
   }
 
   static OH_Drawing_FontCollection* GetGlobalFontCollection() {