update

Author: chunhtai

ci/licenses_golden/licenses_flutter

@@ -1036,6 +1036,7 @@ FILE: ../../../flutter/third_party/txt/src/txt/platform_android.cc
 FILE: ../../../flutter/third_party/txt/src/txt/platform_fuchsia.cc
 FILE: ../../../flutter/third_party/txt/src/txt/platform_linux.cc
 FILE: ../../../flutter/third_party/txt/src/txt/platform_mac.mm
+FILE: ../../../flutter/third_party/txt/src/txt/platform_windows.cc
 FILE: ../../../flutter/vulkan/vulkan_application.cc
 FILE: ../../../flutter/vulkan/vulkan_application.h
 FILE: ../../../flutter/vulkan/vulkan_backbuffer.cc

shell/common/shell.cc

@@ -1379,10 +1379,9 @@ bool Shell::ReloadSystemFonts() {
   document.Accept(writer);
   std::string message = buffer.GetString();
   fml::RefPtr<PlatformMessage> fontsChangeMessage =
-    fml::MakeRefCounted<flutter::PlatformMessage>(
-      kSystemChannel,
-      std::vector<uint8_t>(message.begin(), message.end()),
-      nullptr);
+      fml::MakeRefCounted<flutter::PlatformMessage>(
+          kSystemChannel, std::vector<uint8_t>(message.begin(), message.end()),
+          nullptr);
 
   OnPlatformViewDispatchPlatformMessage(fontsChangeMessage);
   return true;

shell/common/shell.h

@@ -285,9 +285,10 @@ class Shell final : public PlatformView::Delegate,
   fml::Status WaitForFirstFrame(fml::TimeDelta timeout);
 
   //----------------------------------------------------------------------------
-  /// @brief      Used by embedders to reload the system fonts in FontCollection.
-  ///             It also clears the cached font families and send system channel
-  ///             message to framework to rebuild affected widgets.
+  /// @brief      Used by embedders to reload the system fonts in
+  /// FontCollection.
+  ///             It also clears the cached font families and send system
+  ///             channel message to framework to rebuild affected widgets.
   ///
   /// @return     Returns if shell reloads system fonts successfully.
   ///

shell/common/shell_unittests.cc

@@ -532,17 +532,21 @@ TEST_F(ShellTest, ReloadSystemFonts) {
   std::vector<std::string> families(1, "Robotofake");
   auto font =
       fontCollection->GetMinikinFontCollectionForFamilies(families, "en");
-  ASSERT_EQ(font->getId(), static_cast<double>(0));
+  if (font == nullptr) {
+    // System does not have any font to begin with. Aborts the test.
+    return;
+  }
+  unsigned int id = font->getId();
   // Result should be cached.
   font = fontCollection->GetMinikinFontCollectionForFamilies(families, "en");
-  ASSERT_EQ(font->getId(), static_cast<double>(0));
+  ASSERT_EQ(font->getId(), id);
   bool result = shell->ReloadSystemFonts();
 
-  // Cache is cleared, and FontCollection will be assigned a new id in
-  // incremental order.
+  // Cache is cleared, and FontCollection will be assigned a new id.
   font = fontCollection->GetMinikinFontCollectionForFamilies(families, "en");
-  ASSERT_EQ(font->getId(), static_cast<double>(1));
+  ASSERT_NE(font->getId(), id);
   ASSERT_TRUE(result);
+  shell.reset();
 }
 
 TEST_F(ShellTest, WaitForFirstFrame) {

shell/platform/embedder/tests/embedder_unittests.cc

@@ -238,6 +238,7 @@ TEST(EmbedderTestNoFixture, CanGetCurrentTimeInNanoseconds) {
 TEST_F(EmbedderTest, CanReloadSystemFonts) {
   auto& context = GetEmbedderContext();
   EmbedderConfigBuilder builder(context);
+  builder.SetSoftwareRendererConfig();
   auto engine = builder.LaunchEngine();
   ASSERT_TRUE(engine.is_valid());