From 77474bd3baac04174fc002da7ed435b49965b0de Mon Sep 17 00:00:00 2001 From: Jason Simmons Date: Thu, 8 Mar 2018 16:17:02 -0800 Subject: [PATCH] Revert "Enable libtxt as the default text renderer (#4751)" (flutter/engine#4758) This reverts commit e35e882cebc7d4b7eb98bdd0c89e781278952032. --- engine/src/flutter/shell/common/shell.cc | 2 +- engine/src/flutter/shell/common/switches.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/engine/src/flutter/shell/common/shell.cc b/engine/src/flutter/shell/common/shell.cc index 9b78c1c1a53..3b56c6a46b8 100644 --- a/engine/src/flutter/shell/common/shell.cc +++ b/engine/src/flutter/shell/common/shell.cc @@ -120,7 +120,7 @@ void Shell::InitStandalone(fxl::CommandLine command_line, command_line.HasOption(FlagForSwitch(Switch::EnableSoftwareRendering)); settings.using_blink = - command_line.HasOption(FlagForSwitch(Switch::EnableBlink)); + !command_line.HasOption(FlagForSwitch(Switch::EnableTxt)); settings.endless_trace_buffer = command_line.HasOption(FlagForSwitch(Switch::EndlessTraceBuffer)); diff --git a/engine/src/flutter/shell/common/switches.h b/engine/src/flutter/shell/common/switches.h index 91778a78e92..8ee6a93dc33 100644 --- a/engine/src/flutter/shell/common/switches.h +++ b/engine/src/flutter/shell/common/switches.h @@ -63,9 +63,9 @@ DEF_SWITCH(SkiaDeterministicRendering, "Skips the call to SkGraphics::Init(), thus avoiding swapping out" "some Skia function pointers based on available CPU features. This" "is used to obtain 100% deterministic behavior in Skia rendering.") -DEF_SWITCH(EnableBlink, - "enable-blink", - "Enable Blink as the text shaping library instead of libtxt.") +DEF_SWITCH(EnableTxt, + "enable-txt", + "Enable libtxt as the text shaping library instead of Blink.") DEF_SWITCH(FLX, "flx", "Specify the FLX path.") DEF_SWITCH(FlutterAssetsDir, "flutter-assets-dir",