Chromium Code Reviews| 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 b88ff96cff5c5af7ff938f5028edc8244574743d..3c791f1f88c0a31fd51cb0065e77fefbd9b766d0 100644 |
| --- a/content/browser/android/content_startup_flags.cc |
| +++ b/content/browser/android/content_startup_flags.cc |
| @@ -50,7 +50,7 @@ void SetContentCommandLineFlags(int max_render_process_count, |
| CommandLine* parsed_command_line = CommandLine::ForCurrentProcess(); |
| -#if !defined(ANDROID_UPSTREAM_BRINGUP) |
| + |
| // TODO(yfriedman): Upstream this when bringing up rendering code and |
| // rendering modes. b/6668088 |
| // Set subflags for the --graphics-mode=XYZ omnibus flag. |
| @@ -69,15 +69,17 @@ void SetContentCommandLineFlags(int max_render_process_count, |
| // Intentionally blank. |
| } else if (graphics_mode == switches::kGraphicsModeValueCompositor) { |
| SetCommandLineSwitch(switches::kForceCompositingMode); |
| +#if !defined(ANDROID_UPSTREAM_BRINGUP) |
|
aelias_OOO_until_Jul13
2012/07/19 03:43:51
Let's not leave this around certain flags, we'll f
Yusuf
2012/07/19 05:01:52
Done.
|
| SetCommandLineSwitch(switches::kEnableAcceleratedPlugins); |
| SetCommandLineSwitch(switches::kEnableCompositingForFixedPosition); |
| - SetCommandLineSwitch(switches::kEnableThreadedCompositing); |
| // Per tile painting saves memory in background tabs (http://b/5669228). |
| SetCommandLineSwitch(switches::kEnablePerTilePainting); |
| +#endif |
| + SetCommandLineSwitch(switches::kEnableThreadedCompositing); |
| + |
| } else { |
| LOG(FATAL) << "Invalid --graphics-mode flag: " << graphics_mode; |
| } |
| -#endif |
| if (parsed_command_line->HasSwitch(switches::kRendererProcessLimit)) { |
| std::string limit = parsed_command_line->GetSwitchValueASCII( |