Move have_wheel_event_handlers to WebLayerTreeView.

cc/trees/layer_tree_host_common.cc

Index: cc/trees/layer_tree_host_common.cc
diff --git a/cc/trees/layer_tree_host_common.cc b/cc/trees/layer_tree_host_common.cc
index 14149181542030833dd98a146234ed75f0b54780..9dd0c2206dc48ddbfb0407398700f2644f660b33 100644
--- a/cc/trees/layer_tree_host_common.cc
+++ b/cc/trees/layer_tree_host_common.cc
@@ -644,9 +644,9 @@ static inline bool SubtreeShouldBeSkipped(LayerImpl* layer,
   if (layer->num_copy_requests_in_target_subtree() > 0)
     return false;
 
-  // We cannot skip the the subtree if a descendant has a wheel or touch handler
+  // We cannot skip the the subtree if a descendant has a touch handler
   // or the hit testing code will break (it requires fresh transforms, etc).
-  if (layer->layer_or_descendant_has_input_handler())
+  if (layer->layer_or_descendant_has_touch_handler())
     return false;
 
   // If the layer is not drawn, then skip it and its subtree.
@@ -1058,20 +1058,20 @@ static inline void RemoveSurfaceForEarlyExit(
 struct PreCalculateMetaInformationRecursiveData {
   size_t num_unclipped_descendants;
   int num_layer_or_descendants_with_copy_request;
-  int num_layer_or_descendants_with_input_handler;
+  int num_layer_or_descendants_with_touch_handler;
   int num_descendants_that_draw_content;
 
   PreCalculateMetaInformationRecursiveData()
       : num_unclipped_descendants(0),
         num_layer_or_descendants_with_copy_request(0),
-        num_layer_or_descendants_with_input_handler(0),
+        num_layer_or_descendants_with_touch_handler(0),
         num_descendants_that_draw_content(0) {}
 
   void Merge(const PreCalculateMetaInformationRecursiveData& data) {
     num_layer_or_descendants_with_copy_request +=
         data.num_layer_or_descendants_with_copy_request;
-    num_layer_or_descendants_with_input_handler +=
-        data.num_layer_or_descendants_with_input_handler;
+    num_layer_or_descendants_with_touch_handler +=
+        data.num_layer_or_descendants_with_touch_handler;
     num_unclipped_descendants += data.num_unclipped_descendants;
     num_descendants_that_draw_content += data.num_descendants_that_draw_content;
   }
@@ -1128,9 +1128,8 @@ static void PreCalculateMetaInformationInternal(
   if (layer->HasCopyRequest())
     recursive_data->num_layer_or_descendants_with_copy_request++;
 
-  if (!layer->touch_event_handler_region().IsEmpty() ||
-      layer->have_wheel_event_handlers())
-    recursive_data->num_layer_or_descendants_with_input_handler++;
+  if (!layer->touch_event_handler_region().IsEmpty())
+    recursive_data->num_layer_or_descendants_with_touch_handler++;
 
   layer->set_num_unclipped_descendants(
       recursive_data->num_unclipped_descendants);
@@ -1176,14 +1175,13 @@ static void PreCalculateMetaInformationInternal(
   if (layer->HasCopyRequest())
     recursive_data->num_layer_or_descendants_with_copy_request++;
 
-  if (!layer->touch_event_handler_region().IsEmpty() ||
-      layer->have_wheel_event_handlers())
-    recursive_data->num_layer_or_descendants_with_input_handler++;
+  if (!layer->touch_event_handler_region().IsEmpty())
+    recursive_data->num_layer_or_descendants_with_touch_handler++;
 
   layer->draw_properties().num_unclipped_descendants =
       recursive_data->num_unclipped_descendants;
-  layer->set_layer_or_descendant_has_input_handler(
-      (recursive_data->num_layer_or_descendants_with_input_handler != 0));
+  layer->set_layer_or_descendant_has_touch_handler(
+      (recursive_data->num_layer_or_descendants_with_touch_handler != 0));
   // TODO(enne): this should be synced from the main thread, so is only
   // for tests constructing layers on the compositor thread.
   layer->SetNumDescendantsThatDrawContent(