Skip to content

Commit b5162c9

Browse files
Use the SkParagraph text renderer by default (flutter#28912)
1 parent 83cfdcc commit b5162c9

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

shell/common/switches.cc

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -411,8 +411,9 @@ Settings SettingsFromCommandLine(const fml::CommandLine& command_line) {
411411
settings.use_test_fonts =
412412
command_line.HasOption(FlagForSwitch(Switch::UseTestFonts));
413413

414-
settings.enable_skparagraph =
415-
command_line.HasOption(FlagForSwitch(Switch::EnableSkParagraph));
414+
std::string enable_skparagraph = command_line.GetOptionValueWithDefault(
415+
FlagForSwitch(Switch::EnableSkParagraph), "");
416+
settings.enable_skparagraph = enable_skparagraph != "false";
416417

417418
settings.prefetched_default_font_manager = command_line.HasOption(
418419
FlagForSwitch(Switch::PrefetchedDefaultFontManager));

shell/platform/android/io/flutter/embedding/engine/loader/FlutterLoader.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,8 @@ public void ensureInitializationComplete(
308308

309309
shellArgs.add("--prefetched-default-font-manager");
310310

311-
if (metaData != null && metaData.getBoolean(ENABLE_SKPARAGRAPH_META_DATA_KEY)) {
311+
if (metaData == null || metaData.getBoolean(ENABLE_SKPARAGRAPH_META_DATA_KEY, true)) {
312+
312313
shellArgs.add("--enable-skparagraph");
313314
}
314315

shell/platform/darwin/ios/framework/Source/FlutterDartProject.mm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@
158158

159159
// SkParagraph text layout library
160160
NSNumber* enableSkParagraph = [mainBundle objectForInfoDictionaryKey:@"FLTEnableSkParagraph"];
161-
settings.enable_skparagraph = (enableSkParagraph != nil) ? enableSkParagraph.boolValue : false;
161+
settings.enable_skparagraph = (enableSkParagraph != nil) ? enableSkParagraph.boolValue : true;
162162

163163
// Leak Dart VM settings, set whether leave or clean up the VM after the last shell shuts down.
164164
NSNumber* leakDartVM = [mainBundle objectForInfoDictionaryKey:@"FLTLeakDartVM"];

0 commit comments

Comments
 (0)