Aura on Android: content/browser

content/browser/android/content_startup_flags.cc

Index: content/browser/android/content_startup_flags.cc
diff --git a/content/browser/android/content_startup_flags.cc b/content/browser/android/content_startup_flags.cc
index 9821566fdd57193af7d8a84b44afae562e7f4d34..c8376320688b121f59aa0ac0e06afbbe6678c630 100644
--- a/content/browser/android/content_startup_flags.cc
+++ b/content/browser/android/content_startup_flags.cc
@@ -99,11 +99,13 @@ void SetContentCommandLineFlags(bool single_process,
         switches::kProfilerTiming, switches::kProfilerTimingDisabledValue);
   }
 
+#if !defined(USE_AURA)
   cc::LayerSettings layer_settings;
   if (parsed_command_line->HasSwitch(
           switches::kEnableAndroidCompositorAnimationTimelines))

[mfomitchev, 2015/11/03 22:23:20]

Should we create a crbug for this? What's the right thing to do here - remove
the switch on Aura Android?

[no sievers, 2015/11/04 01:59:32]

ui::Compositor does the same thing in ui/compositor/layer.cc:

void Layer::InitializeUILayerSettings() {
  base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
  if (command_line->HasSwitch(switches::kUIEnableCompositorAnimationTimelines))
    g_ui_layer_settings.Get().use_compositor_animation_timelines = true;
}

So this is fine. But if you want to avoid the ifdef and rather have it in some
non-aura .cc file somewhere, there is probably a simple way to do that, such as
removing SetLayerSettings and having a wrapper class for the
LazyInstance<cc::LayerSettings> that overrides this one setting based on the
cmdline in its constructor.

[mfomitchev, 2015/11/04 20:49:31]

Acknowledged. Seems odd that the flags are different for Aura vs Android, but I
guess there's some reason for that.

     layer_settings.use_compositor_animation_timelines = true;
   Compositor::SetLayerSettings(layer_settings);
+#endif
 }
 
 }  // namespace content