From d72908a9fef4a0cf20868ea5b2c6fa019af42e82 Mon Sep 17 00:00:00 2001 From: Todd Volkert Date: Tue, 20 Feb 2018 19:36:34 -0800 Subject: [PATCH] Respect Switch::SkiaDeterministicRendering in all runtime modes (flutter/engine#4695) https://github.com/flutter/flutter/issues/14519 --- engine/src/flutter/shell/common/shell.cc | 7 +------ engine/src/flutter/shell/common/switches.h | 4 +--- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/engine/src/flutter/shell/common/shell.cc b/engine/src/flutter/shell/common/shell.cc index 78c0821ae3..3b56c6a46b 100644 --- a/engine/src/flutter/shell/common/shell.cc +++ b/engine/src/flutter/shell/common/shell.cc @@ -84,13 +84,8 @@ void Shell::InitStandalone(fxl::CommandLine command_line, fml::icu::InitializeICU(icu_data_path); -#if FLUTTER_RUNTIME_MODE == FLUTTER_RUNTIME_MODE_DEBUG - if (!command_line.HasOption(FlagForSwitch(Switch::SkiaDeterministicRendering))) { + if (!command_line.HasOption(FlagForSwitch(Switch::SkiaDeterministicRendering))) SkGraphics::Init(); - } -#else - SkGraphics::Init(); -#endif blink::Settings settings; settings.application_library_path = application_library_path; diff --git a/engine/src/flutter/shell/common/switches.h b/engine/src/flutter/shell/common/switches.h index 397b14417d..8ee6a93dc3 100644 --- a/engine/src/flutter/shell/common/switches.h +++ b/engine/src/flutter/shell/common/switches.h @@ -62,9 +62,7 @@ DEF_SWITCH(SkiaDeterministicRendering, "skia-deterministic-rendering", "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." - "This flag is ignored when the runtime mode is anything other than" - "debug.") + "is used to obtain 100% deterministic behavior in Skia rendering.") DEF_SWITCH(EnableTxt, "enable-txt", "Enable libtxt as the text shaping library instead of Blink.")