[fuchsia][skp warmup] dont serialize font data

Author: freiling

shell/common/BUILD.gn

@@ -255,5 +255,15 @@ if (enable_unittests) {
       "//flutter/shell/version",
       "//third_party/googletest:gmock",
     ]
+
+    if (is_fuchsia) {
+      if (using_fuchsia_gn_sdk) {
+        deps += [ "$fuchsia_sdk_root/pkg/sys_cpp" ]
+      } else if (using_fuchsia_sdk) {
+        deps += [ "$fuchsia_sdk_root/pkg:sys_cpp" ]
+      } else {
+        deps += [ "//sdk/lib/sys/cpp" ]
+      }
+    }
   }
 }

shell/common/rasterizer.cc

@@ -510,6 +510,7 @@ static sk_sp<SkData> ScreenshotLayerTreeAsPicture(
 #if defined(OS_FUCHSIA)
   SkSerialProcs procs = {0};
   procs.fImageProc = SerializeImageWithoutData;
+  procs.fTypefaceProc = SerializeTypefaceWithoutData;
 #else
   SkSerialProcs procs = {0};
   procs.fTypefaceProc = SerializeTypefaceWithData;

shell/common/serialization_callbacks.cc

@@ -5,19 +5,26 @@
 #include "flutter/fml/logging.h"
 #include "include/core/SkImage.h"
 #include "include/core/SkPicture.h"
+#include "include/core/SkSerialProcs.h"
 #include "include/core/SkStream.h"
 #include "include/core/SkTypeface.h"
 
 namespace flutter {
 
 sk_sp<SkData> SerializeTypefaceWithoutData(SkTypeface* typeface, void* ctx) {
-  return typeface->serialize(SkTypeface::SerializeBehavior::kDontIncludeData);
+  return SkData::MakeEmpty();
 }
 
 sk_sp<SkData> SerializeTypefaceWithData(SkTypeface* typeface, void* ctx) {
   return typeface->serialize(SkTypeface::SerializeBehavior::kDoIncludeData);
 }
 
+sk_sp<SkTypeface> DeserializeTypefaceWithoutData(const void* data,
+                                                 size_t length,
+                                                 void* ctx) {
+  return SkTypeface::MakeDefault();
+}
+
 struct ImageMetaData {
   int32_t width;
   int32_t height;

shell/common/serialization_callbacks.h

@@ -15,6 +15,9 @@ namespace flutter {
 
 sk_sp<SkData> SerializeTypefaceWithoutData(SkTypeface* typeface, void* ctx);
 sk_sp<SkData> SerializeTypefaceWithData(SkTypeface* typeface, void* ctx);
+sk_sp<SkTypeface> DeserializeTypefaceWithoutData(const void* data,
+                                                 size_t length,
+                                                 void* ctx);
 
 // Serializes only the metadata of the image and not the underlying pixel data.
 sk_sp<SkData> SerializeImageWithoutData(SkImage* image, void* ctx);

shell/common/skp_shader_warmup_unittests.cc

@@ -19,15 +19,19 @@
 #include "flutter/shell/common/switches.h"
 #include "flutter/shell/version/version.h"
 #include "flutter/testing/testing.h"
+#include "include/core/SkFont.h"
 #include "include/core/SkPicture.h"
 #include "include/core/SkPictureRecorder.h"
 #include "include/core/SkSerialProcs.h"
+#include "include/core/SkTextBlob.h"
+
+#if defined(OS_FUCHSIA)
+#include "lib/sys/cpp/component_context.h"
+#include "third_party/skia/include/ports/SkFontMgr_fuchsia.h"
 
 namespace flutter {
 namespace testing {
 
-#if defined(OS_FUCHSIA)
-
 static void WaitForIO(Shell* shell) {
   std::promise<bool> io_task_finished;
   shell->GetTaskRunners().GetIOTaskRunner()->PostTask(
@@ -103,8 +107,13 @@ class SkpWarmupTest : public ShellTest {
 
             SkDeserialProcs procs = {0};
             procs.fImageProc = DeserializeImageWithoutData;
+            procs.fTypefaceProc = DeserializeTypefaceWithoutData;
             sk_sp<SkPicture> picture =
                 SkPicture::MakeFromStream(stream.get(), &procs);
+            if (!picture) {
+              FML_LOG(ERROR) << "Failed to deserialize " << filename;
+              return true;
+            }
             pictures.push_back(std::move(picture));
             fd.reset();
           }
@@ -242,7 +251,51 @@ TEST_F(SkpWarmupTest, Image) {
   TestWarmup(draw_size, builder);
 }
 
-#endif
+// Re-enable once https://bugs.chromium.org/p/skia/issues/detail?id=10404
+// is fixed and integrated, or a workaround is found.
+TEST_F(SkpWarmupTest, DISABLED_Text) {
+  auto context = sys::ComponentContext::Create();
+  fuchsia::fonts::ProviderSyncPtr sync_font_provider;
+  context->svc()->Connect(sync_font_provider.NewRequest());
+  auto font_mgr = SkFontMgr_New_Fuchsia(std::move(sync_font_provider));
+  auto raw_typeface =
+      font_mgr->matchFamilyStyle(nullptr, SkFontStyle::Normal());
+  auto typeface = sk_sp<SkTypeface>(raw_typeface);
+
+  SkFont font(typeface, 12);
+  auto text_blob =
+      SkTextBlob::MakeFromString("test", font, SkTextEncoding::kUTF8);
+
+  SkISize draw_size =
+      SkISize::Make(text_blob->bounds().width(), text_blob->bounds().height());
+  // We reuse this builder to draw the same content sever times in this test
+  LayerTreeBuilder builder = [&draw_size, &text_blob,
+                              this](std::shared_ptr<ContainerLayer> root) {
+    SkPictureRecorder recorder;
+
+    auto canvas =
+        recorder.beginRecording(draw_size.width(), draw_size.height());
+
+    auto color_space = SkColorSpace::MakeSRGB();
+    auto paint = SkPaint(SkColors::kWhite, color_space.get());
+    canvas->drawTextBlob(text_blob, draw_size.width() / 2,
+                         draw_size.height() / 2, paint);
+
+    auto picture = recorder.finishRecordingAsPicture();
+
+    fml::RefPtr<SkiaUnrefQueue> queue = fml::MakeRefCounted<SkiaUnrefQueue>(
+        this->GetCurrentTaskRunner(), fml::TimeDelta::FromSeconds(0));
+    auto picture_layer = std::make_shared<PictureLayer>(
+        SkPoint::Make(0, 0), SkiaGPUObject<SkPicture>(picture, queue),
+        /* is_complex */ false,
+        /* will_change */ false);
+    root->Add(picture_layer);
+  };
+
+  TestWarmup(draw_size, builder);
+}
 
 }  // namespace testing
 }  // namespace flutter
+
+#endif

testing/fuchsia/meta/fuchsia_test.cmx

@@ -18,7 +18,8 @@
       "fuchsia.vulkan.loader.Loader",
       "fuchsia.logger.LogSink",
       "fuchsia.tracing.provider.Registry",
-      "fuchsia.intl.PropertyProvider"
+      "fuchsia.intl.PropertyProvider",
+      "fuchsia.fonts.Provider"
     ]
   }
 }