Use the SkParagraph text renderer by default
diff --git a/shell/common/switches.cc b/shell/common/switches.cc
index 491ca93..0824cd9 100644
--- a/shell/common/switches.cc
+++ b/shell/common/switches.cc
@@ -407,8 +407,9 @@
settings.use_test_fonts =
command_line.HasOption(FlagForSwitch(Switch::UseTestFonts));
- settings.enable_skparagraph =
- command_line.HasOption(FlagForSwitch(Switch::EnableSkParagraph));
+ std::string enable_skparagraph = command_line.GetOptionValueWithDefault(
+ FlagForSwitch(Switch::EnableSkParagraph), "");
+ settings.enable_skparagraph = enable_skparagraph != "false";
settings.prefetched_default_font_manager = command_line.HasOption(
FlagForSwitch(Switch::PrefetchedDefaultFontManager));
diff --git a/shell/platform/android/io/flutter/embedding/engine/loader/FlutterLoader.java b/shell/platform/android/io/flutter/embedding/engine/loader/FlutterLoader.java
index 0a3c81e..9ced639 100644
--- a/shell/platform/android/io/flutter/embedding/engine/loader/FlutterLoader.java
+++ b/shell/platform/android/io/flutter/embedding/engine/loader/FlutterLoader.java
@@ -295,7 +295,8 @@
shellArgs.add("--prefetched-default-font-manager");
- if (metaData != null && metaData.getBoolean(ENABLE_SKPARAGRAPH_META_DATA_KEY)) {
+ if (metaData == null || metaData.getBoolean(ENABLE_SKPARAGRAPH_META_DATA_KEY, true)) {
+
shellArgs.add("--enable-skparagraph");
}
diff --git a/shell/platform/darwin/ios/framework/Source/FlutterDartProject.mm b/shell/platform/darwin/ios/framework/Source/FlutterDartProject.mm
index c4c9ced..4934597 100644
--- a/shell/platform/darwin/ios/framework/Source/FlutterDartProject.mm
+++ b/shell/platform/darwin/ios/framework/Source/FlutterDartProject.mm
@@ -158,7 +158,7 @@
// SkParagraph text layout library
NSNumber* enableSkParagraph = [mainBundle objectForInfoDictionaryKey:@"FLTEnableSkParagraph"];
- settings.enable_skparagraph = (enableSkParagraph != nil) ? enableSkParagraph.boolValue : false;
+ settings.enable_skparagraph = (enableSkParagraph != nil) ? enableSkParagraph.boolValue : true;
#if FLUTTER_RUNTIME_MODE == FLUTTER_RUNTIME_MODE_DEBUG
// There are no ownership concerns here as all mappings are owned by the
