Add flag to skip call to SkGraphics::Init() (flutter#4694)

flutter/flutter#14519
sunwukonk2012 · Feb 21, 2018 · 4cafde3 · 4cafde3
1 parent 5856104
commit 4cafde3
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 0 deletions.
diff --git a/shell/common/shell.cc b/shell/common/shell.cc
@@ -84,7 +84,13 @@ 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))) {
+    SkGraphics::Init();
+  }
+#else
   SkGraphics::Init();
+#endif
 
   blink::Settings settings;
   settings.application_library_path = application_library_path;

diff --git a/shell/common/switches.h b/shell/common/switches.h
@@ -58,6 +58,13 @@ DEF_SWITCH(EnableSoftwareRendering,
            "Enable rendering using the Skia software backend. This is useful"
            "when testing Flutter on emulators. By default, Flutter will"
            "attempt to either use OpenGL or Vulkan.")
+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.")
 DEF_SWITCH(EnableTxt,
            "enable-txt",
            "Enable libtxt as the text shaping library instead of Blink.")

diff --git a/shell/platform/android/io/flutter/app/FlutterActivityDelegate.java b/shell/platform/android/io/flutter/app/FlutterActivityDelegate.java
@@ -298,6 +298,9 @@ private static String[] getArgsFromIntent(Intent intent) {
         if (intent.getBooleanExtra("enable-software-rendering", false)) {
             args.add("--enable-software-rendering");
         }
+        if (intent.getBooleanExtra("skia-deterministic-rendering", false)) {
+            args.add("--skia-deterministic-rendering");
+        }
         if (intent.getBooleanExtra("trace-skia", false)) {
             args.add("--trace-skia");
         }