From 8d1d470b32888ae5f9a84667c97995e32ababc14 Mon Sep 17 00:00:00 2001 From: Harry Terkelsen Date: Fri, 21 Oct 2022 12:59:45 -0700 Subject: [PATCH 1/4] Remove embedded font from CanvasKit build --- tools/gn | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/gn b/tools/gn index 8e1f782b6376d..43d80c0e243b8 100755 --- a/tools/gn +++ b/tools/gn @@ -610,7 +610,8 @@ def to_gn_wasm_args(args, gn_args): gn_args['skia_use_libheif'] = False gn_args['skia_enable_fontmgr_custom_directory'] = False gn_args['skia_enable_fontmgr_custom_embedded'] = True - gn_args['skia_enable_fontmgr_custom_empty'] = False + gn_args['skia_enable_fontmgr_custom_empty'] = True + gn_args['skia_fontmgr_factory'] = "//third_party/skia:fontmgr_custom_empty_factory" gn_args['skia_enable_skshaper'] = True gn_args['skia_enable_skparagraph'] = True gn_args['skia_canvaskit_force_tracing'] = False From 812571546351982f5c6163d3a81db7aaf0e9388b Mon Sep 17 00:00:00 2001 From: Harry Terkelsen Date: Fri, 21 Oct 2022 13:13:03 -0700 Subject: [PATCH 2/4] Format --- tools/gn | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/gn b/tools/gn index 43d80c0e243b8..698e4bdd9d28d 100755 --- a/tools/gn +++ b/tools/gn @@ -611,7 +611,8 @@ def to_gn_wasm_args(args, gn_args): gn_args['skia_enable_fontmgr_custom_directory'] = False gn_args['skia_enable_fontmgr_custom_embedded'] = True gn_args['skia_enable_fontmgr_custom_empty'] = True - gn_args['skia_fontmgr_factory'] = "//third_party/skia:fontmgr_custom_empty_factory" + gn_args['skia_fontmgr_factory' + ] = "//third_party/skia:fontmgr_custom_empty_factory" gn_args['skia_enable_skshaper'] = True gn_args['skia_enable_skparagraph'] = True gn_args['skia_canvaskit_force_tracing'] = False From 7992c89a84bfdf10face468a648875957c927209 Mon Sep 17 00:00:00 2001 From: Harry Terkelsen Date: Fri, 21 Oct 2022 13:57:52 -0700 Subject: [PATCH 3/4] Change other flag --- tools/gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/gn b/tools/gn index 698e4bdd9d28d..d22b039e5921d 100755 --- a/tools/gn +++ b/tools/gn @@ -626,7 +626,7 @@ def to_gn_wasm_args(args, gn_args): gn_args['skia_canvaskit_enable_matrix_helper'] = False gn_args['skia_canvaskit_enable_canvas_bindings'] = False gn_args['skia_canvaskit_enable_font'] = True - gn_args['skia_canvaskit_enable_embedded_font'] = True + gn_args['skia_canvaskit_enable_embedded_font'] = False gn_args['skia_canvaskit_enable_alias_font'] = True gn_args['skia_canvaskit_legacy_draw_vertices_blend_mode'] = False gn_args['skia_canvaskit_enable_debugger'] = False From adac4f8d0366a0a9e285726357b5553a303f8070 Mon Sep 17 00:00:00 2001 From: Harry Terkelsen Date: Fri, 21 Oct 2022 13:58:58 -0700 Subject: [PATCH 4/4] Use single quote --- tools/gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/gn b/tools/gn index d22b039e5921d..06f34e959a304 100755 --- a/tools/gn +++ b/tools/gn @@ -612,7 +612,7 @@ def to_gn_wasm_args(args, gn_args): gn_args['skia_enable_fontmgr_custom_embedded'] = True gn_args['skia_enable_fontmgr_custom_empty'] = True gn_args['skia_fontmgr_factory' - ] = "//third_party/skia:fontmgr_custom_empty_factory" + ] = '//third_party/skia:fontmgr_custom_empty_factory' gn_args['skia_enable_skshaper'] = True gn_args['skia_enable_skparagraph'] = True gn_args['skia_canvaskit_force_tracing'] = False