Remove flag to disable cc touch hit testing.

Compositor touch hit testing was re-enabled on Android webview back in February
(https://codereview.chromium.org/183943002) and we haven't had any complaints
since. It's probably safe to remove the flag and related code now.

This is part 1 of 2, will be followed by:
https://codereview.chromium.org/406053002

BUG=304518

Review URL: https://codereview.chromium.org/399953004

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

7 files changed, 0 insertions, 9 deletions

diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
index 591b550..57f483c 100644
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -1202,7 +1202,6 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
     // also be added to chrome/browser/chromeos/login/chrome_restart_request.cc.
     cc::switches::kCompositeToMailbox,
     cc::switches::kDisableCompositedAntialiasing,
-    cc::switches::kDisableCompositorTouchHitTesting,
     cc::switches::kDisableMainFrameBeforeActivation,
     cc::switches::kDisableMainFrameBeforeDraw,
     cc::switches::kDisableThreadedAnimation,
diff --git a/content/browser/renderer_host/render_view_host_impl.cc b/content/browser/renderer_host/render_view_host_impl.cc
index 97d876d..73afc7b 100644
--- a/content/browser/renderer_host/render_view_host_impl.cc
+++ b/content/browser/renderer_host/render_view_host_impl.cc
@@ -433,8 +433,6 @@ WebPreferences RenderViewHostImpl::ComputeWebkitPrefs(const GURL& url) {
 
   prefs.touch_adjustment_enabled =
       !command_line.HasSwitch(switches::kDisableTouchAdjustment);
-  prefs.compositor_touch_hit_testing =
-      !command_line.HasSwitch(cc::switches::kDisableCompositorTouchHitTesting);
 
 #if defined(OS_MACOSX) || defined(OS_CHROMEOS)
   bool default_enable_scroll_animator = true;
diff --git a/content/public/common/common_param_traits_macros.h b/content/public/common/common_param_traits_macros.h
index 5d68491..26dc2c1 100644
--- a/content/public/common/common_param_traits_macros.h
+++ b/content/public/common/common_param_traits_macros.h
@@ -173,7 +173,6 @@ IPC_STRUCT_TRAITS_BEGIN(content::WebPreferences)
   IPC_STRUCT_TRAITS_MEMBER(main_frame_resizes_are_orientation_changes)
   IPC_STRUCT_TRAITS_MEMBER(initialize_at_minimum_page_scale)
   IPC_STRUCT_TRAITS_MEMBER(smart_insert_delete_enabled)
-  IPC_STRUCT_TRAITS_MEMBER(compositor_touch_hit_testing)
   IPC_STRUCT_TRAITS_MEMBER(cookie_enabled)
   IPC_STRUCT_TRAITS_MEMBER(navigate_on_drag_drop)
   IPC_STRUCT_TRAITS_MEMBER(spatial_navigation_enabled)
diff --git a/content/public/common/web_preferences.cc b/content/public/common/web_preferences.cc
index 050140e..13171ad 100644
--- a/content/public/common/web_preferences.cc
+++ b/content/public/common/web_preferences.cc
@@ -127,7 +127,6 @@ WebPreferences::WebPreferences()
       pinch_virtual_viewport_enabled(false),
       pinch_overlay_scrollbar_thickness(0),
       use_solid_color_scrollbars(false),
-      compositor_touch_hit_testing(true),
       navigate_on_drag_drop(true),
       cookie_enabled(true),
       pepper_accelerated_video_decode_enabled(false)
diff --git a/content/public/common/web_preferences.h b/content/public/common/web_preferences.h
index 930e1f4..78e0e63 100644
--- a/content/public/common/web_preferences.h
+++ b/content/public/common/web_preferences.h
@@ -139,7 +139,6 @@ struct CONTENT_EXPORT WebPreferences {
   bool pinch_virtual_viewport_enabled;
   int pinch_overlay_scrollbar_thickness;
   bool use_solid_color_scrollbars;
-  bool compositor_touch_hit_testing;
   bool navigate_on_drag_drop;
 
   // This flags corresponds to a Page's Settings' setCookieEnabled state. It
diff --git a/content/renderer/gpu/render_widget_compositor.cc b/content/renderer/gpu/render_widget_compositor.cc
index ca32fe3..64e0982 100644
--- a/content/renderer/gpu/render_widget_compositor.cc
+++ b/content/renderer/gpu/render_widget_compositor.cc
@@ -179,8 +179,6 @@ scoped_ptr<RenderWidgetCompositor> RenderWidgetCompositor::Create(
   settings.report_overscroll_only_for_scrollable_axes = true;
   settings.accelerated_animation_enabled =
       !cmd->HasSwitch(cc::switches::kDisableThreadedAnimation);
-  settings.touch_hit_testing =
-      !cmd->HasSwitch(cc::switches::kDisableCompositorTouchHitTesting);
 
   settings.default_tile_size = CalculateDefaultTileSize();
   if (cmd->HasSwitch(switches::kDefaultTileWidth)) {
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index 45679df..79eca893 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -1182,7 +1182,6 @@ void RenderView::ApplyWebPreferences(const WebPreferences& prefs,
   settings->setPinchOverlayScrollbarThickness(
       prefs.pinch_overlay_scrollbar_thickness);
   settings->setUseSolidColorScrollbars(prefs.use_solid_color_scrollbars);
-  settings->setCompositorTouchHitTesting(prefs.compositor_touch_hit_testing);
 }
 
 /*static*/