Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(914)

Unified Diff: content/browser/android/content_startup_flags.cc

Issue 10790066: Enable gesture events handling on Android. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Added comments to avoid confusion when merging downstream Created 8 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 445b04c0eb2135caefd4508256785c77df0c298b..1d4507514cba3d388fda84d86c27f30393efca94 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.
@@ -73,11 +73,11 @@ void SetContentCommandLineFlags(int max_render_process_count,
SetCommandLineSwitch(switches::kEnableCompositingForFixedPosition);
SetCommandLineSwitch(switches::kEnableThreadedCompositing);
// Per tile painting saves memory in background tabs (http://b/5669228).
- SetCommandLineSwitch(switches::kEnablePerTilePainting);
+ // ...but it now fails an SkAssert(), so disable it. b/6819634
+ // SetCommandLineSwitch(switches::kEnablePerTilePainting);
} else {
LOG(FATAL) << "Invalid --graphics-mode flag: " << graphics_mode;
}
-#endif
if (parsed_command_line->HasSwitch(switches::kRendererProcessLimit)) {
std::string limit = parsed_command_line->GetSwitchValueASCII(

Powered by Google App Engine
This is Rietveld 408576698