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..8db308bc7559c1b69f64171e303c69a757dd3a35 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. |
@@ -72,12 +72,14 @@ void SetContentCommandLineFlags(int max_render_process_count, |
SetCommandLineSwitch(switches::kEnableAcceleratedPlugins); |
SetCommandLineSwitch(switches::kEnableCompositingForFixedPosition); |
SetCommandLineSwitch(switches::kEnableThreadedCompositing); |
+#if !defined(ANDROID_UPSTREAM_BRINGUP) |
// Per tile painting saves memory in background tabs (http://b/5669228). |
SetCommandLineSwitch(switches::kEnablePerTilePainting); |
+#endif |
+ |
} else { |
LOG(FATAL) << "Invalid --graphics-mode flag: " << graphics_mode; |
} |
-#endif |
if (parsed_command_line->HasSwitch(switches::kRendererProcessLimit)) { |
std::string limit = parsed_command_line->GetSwitchValueASCII( |