Enable gesture events handling on Android.

content/browser/android/content_startup_flags.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/android/content_startup_flags.h"
 
 #include "base/string_number_conversions.h"
 #include "base/string_split.h"
 #include "base/command_line.h"
 #include "base/logging.h"
@@ skipping 32 matching lines @@
 
 void SetContentCommandLineFlags(int max_render_process_count,
                                 const std::string& plugin_descriptor) {
   // May be called multiple times, to cover all possible program entry points.
   static bool already_initialized = false;
   if (already_initialized) return;
   already_initialized = true;
 
   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.
   std::string graphics_mode;
   if (parsed_command_line->HasSwitch(switches::kGraphicsMode)) {
     graphics_mode = parsed_command_line->GetSwitchValueASCII(
         switches::kGraphicsMode);
   } else {
     // Default mode is threaded compositor mode
     graphics_mode = switches::kGraphicsModeValueCompositor;
     parsed_command_line->AppendSwitchNative(
         switches::kGraphicsMode, graphics_mode.c_str());
   }
 
   if (graphics_mode == switches::kGraphicsModeValueBasic) {
     // Intentionally blank.
   } else if (graphics_mode == switches::kGraphicsModeValueCompositor) {
     SetCommandLineSwitch(switches::kForceCompositingMode);
     SetCommandLineSwitch(switches::kEnableAcceleratedPlugins);
     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(
         switches::kRendererProcessLimit);
     int value;
     if (base::StringToInt(limit, &value))
       max_render_process_count = value;
   }
 
   if (max_render_process_count <= 0) {
@@ skipping 27 matching lines @@
                                          "1");
 
   // TODO(aelias): Enable these flags once they're merged in from upstream.
   //  parsed_command_line->AppendSwitch(switches::kEnableTouchEvents);
   //  parsed_command_line->AppendSwitch(switches::kEnablePinch);
 
   SetPepperCommandLineFlags(plugin_descriptor);
 }
 
 }  // namespace content