Reland "Register fontations typeface factory" This reverts commit 0d7c8e0772ce985bc573b33504d199d2dc024102. Reason for revert: Added relevant missing file to list of generated source in linux-archive-rel configuration. Original change's description: > Revert "Register fontations typeface factory" > > This reverts commit 0108963b730370bd0272df3e436feb8442d4ce64. > > Reason for revert: build error: > https://ci.chromium.org/ui/p/chromium/builders/ci/linux-archive-rel/128539/overview > > Original change's description: > > Register fontations typeface factory > > > > Without this set Chromium is falling back to other typeface factories > > when deserializing typefaces (like when printing). > > > > Change-Id: Id73f8ce847aa877523e60cbbaeb7a4da99703c07 > > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5887784 > > Commit-Queue: Dominik Röttsches <drott@chromium.org> > > Reviewed-by: Dominik Röttsches <drott@chromium.org> > > Cr-Commit-Position: refs/heads/main@{#1359759} > > Change-Id: Id726ad898cc120b3e8005afa677ae4cad7ab6660 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5889760 > Commit-Queue: Yoichi Osato <yoichio@chromium.org> > Owners-Override: Yoichi Osato <yoichio@chromium.org> > Auto-Submit: Yoichi Osato <yoichio@chromium.org> > Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> > Reviewed-by: Yoichi Osato <yoichio@chromium.org> > Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> > Cr-Commit-Position: refs/heads/main@{#1359762} Bug: chromium:369436589 Cq-Include-Trybots: luci.chromium.try:linux_chromium_archive_rel_ng Change-Id: I7044163a276aa745b101a565bb239d017a5d77c5 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5890431 Reviewed-by: Ben Wagner <bungeman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com> Reviewed-by: Yoichi Osato <yoichio@chromium.org> Cr-Commit-Position: refs/heads/main@{#1360662}
diff --git a/skia/BUILD.gn b/skia/BUILD.gn index 034f969..1165603 100644 --- a/skia/BUILD.gn +++ b/skia/BUILD.gn
@@ -179,6 +179,7 @@ if (use_blink) { defines += [ "SK_TYPEFACE_FACTORY_FREETYPE", + "SK_TYPEFACE_FACTORY_FONTATIONS", "SK_FONTMGR_FREETYPE_EMPTY_AVAILABLE", ] } @@ -419,7 +420,7 @@ # Fontations is the backend we are migrating to. In preparation for rollout # default compile-in Fontations as well. if (use_blink) { - # See SK_TYPEFACE_FACTORY_FREETYPE + # See SK_TYPEFACE_FACTORY_FREETYPE and SK_TYPEFACE_FACTORY_FONTATIONS sources += skia_ports_freetype_sources sources += skia_ports_fontmgr_custom_sources sources += skia_ports_typeface_fontations_sources @@ -721,6 +722,13 @@ # skia_core_and_effects rather than the other way around. public_deps = [ "//third_party/dawn/include/dawn:cpp_headers" ] } + if (use_blink) { + # Fontations Rust/C++ bridge interfaces, needed by SkTypeface. + deps += [ + ":bridge_rust_side", + ":path_bridge", + ] + } visibility = [ ":skia" ] }