Add plumbing for flag: --disable-gesture-tap-highlight

BUG=none


Review URL: https://chromiumcodereview.appspot.com/10918009

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@154762 0039d316-1c4b-4281-b951-d872f2087c98

6 files changed, 13 insertions, 0 deletions

diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index c8e64f1..a14bf00 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -619,6 +619,9 @@ WebPreferences WebContentsImpl::GetWebkitPrefs(RenderViewHost* rvh,
   prefs.fixed_position_creates_stacking_context = !command_line.HasSwitch(
       switches::kDisableFixedPositionCreatesStackingContext);
 
+  prefs.gesture_tap_highlight_enabled = !command_line.HasSwitch(
+      switches::kDisableGestureTapHighlight);
+
   prefs.number_of_cpu_cores = base::SysInfo::NumberOfProcessors();
 
   content::GetContentClient()->browser()->OverrideWebkitPrefs(rvh, url, &prefs);
diff --git a/content/common/view_messages.h b/content/common/view_messages.h
index 5336c4b..9b8ade4 100644
--- a/content/common/view_messages.h
+++ b/content/common/view_messages.h
@@ -197,6 +197,7 @@ IPC_STRUCT_TRAITS_BEGIN(webkit_glue::WebPreferences)
   IPC_STRUCT_TRAITS_MEMBER(deferred_2d_canvas_enabled)
   IPC_STRUCT_TRAITS_MEMBER(accelerated_painting_enabled)
   IPC_STRUCT_TRAITS_MEMBER(accelerated_filters_enabled)
+  IPC_STRUCT_TRAITS_MEMBER(gesture_tap_highlight_enabled)
   IPC_STRUCT_TRAITS_MEMBER(accelerated_plugins_enabled)
   IPC_STRUCT_TRAITS_MEMBER(accelerated_layers_enabled)
   IPC_STRUCT_TRAITS_MEMBER(accelerated_animation_enabled)
diff --git a/content/public/common/content_switches.cc b/content/public/common/content_switches.cc
index 6481f75..9062dd7 100644
--- a/content/public/common/content_switches.cc
+++ b/content/public/common/content_switches.cc
@@ -116,6 +116,9 @@ const char kDisableFlashStage3d[]           = "disable-flash-stage3d";
 // Suppresses support for the Geolocation javascript API.
 const char kDisableGeolocation[]            = "disable-geolocation";
 
+// Disable Gesture Tap Highlight
+const char kDisableGestureTapHighlight[]    = "disable-gesture-tap-highlight";
+
 // Disable GL multisampling.
 const char kDisableGLMultisampling[]        = "disable-gl-multisampling";
 
diff --git a/content/public/common/content_switches.h b/content/public/common/content_switches.h
index 0cc428b..6ecc03b 100644
--- a/content/public/common/content_switches.h
+++ b/content/public/common/content_switches.h
@@ -50,6 +50,7 @@ extern const char kDisableFlashFullscreen3d[];
 CONTENT_EXPORT extern const char kDisableFlashStage3d[];
 CONTENT_EXPORT extern const char kDisableForceCompositingMode[];
 extern const char kDisableGeolocation[];
+extern const char kDisableGestureTapHighlight[];
 extern const char kDisableGpu[];
 CONTENT_EXPORT extern const char kDisableGLMultisampling[];
 CONTENT_EXPORT extern const char kDisableGpuProcessPrelaunch[];
diff --git a/webkit/glue/webpreferences.cc b/webkit/glue/webpreferences.cc
index 6335023..0d428dd 100644
--- a/webkit/glue/webpreferences.cc
+++ b/webkit/glue/webpreferences.cc
@@ -92,6 +92,7 @@ WebPreferences::WebPreferences()
       deferred_2d_canvas_enabled(false),
       accelerated_painting_enabled(false),
       accelerated_filters_enabled(false),
+      gesture_tap_highlight_enabled(true),
       accelerated_plugins_enabled(false),
       memory_info_enabled(false),
       fullscreen_enabled(false),
@@ -342,6 +343,9 @@ void WebPreferences::Apply(WebView* web_view) const {
   // Enable gpu-accelerated filters if requested on the command line.
   settings->setAcceleratedFiltersEnabled(accelerated_filters_enabled);
 
+  // Enable gesture tap highlight if requested on the command line.
+  settings->setGestureTapHighlightEnabled(gesture_tap_highlight_enabled);
+
   // Enabling accelerated layers from the command line enabled accelerated
   // 3D CSS, Video, and Animations.
   settings->setAcceleratedCompositingFor3DTransformsEnabled(
diff --git a/webkit/glue/webpreferences.h b/webkit/glue/webpreferences.h
index 06699b3..c414a5e 100644
--- a/webkit/glue/webpreferences.h
+++ b/webkit/glue/webpreferences.h
@@ -109,6 +109,7 @@ struct WEBKIT_GLUE_EXPORT WebPreferences {
   bool deferred_2d_canvas_enabled;
   bool accelerated_painting_enabled;
   bool accelerated_filters_enabled;
+  bool gesture_tap_highlight_enabled;
   bool accelerated_plugins_enabled;
   bool memory_info_enabled;
   bool fullscreen_enabled;