Move content/renderer input handling for web input events to ui

ui/events/blink/input_handler_proxy.cc

 // Copyright 2013 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/renderer/input/input_handler_proxy.h"
+#include "ui/events/blink/input_handler_proxy.h"
 
 #include <algorithm>
 
 #include "base/auto_reset.h"
 #include "base/command_line.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/trace_event/trace_event.h"
-#include "content/common/input/did_overscroll_params.h"
-#include "content/common/input/web_input_event_traits.h"
-#include "content/public/common/content_switches.h"
-#include "content/renderer/input/input_handler_proxy_client.h"
-#include "content/renderer/input/input_scroll_elasticity_controller.h"
-#include "third_party/WebKit/public/platform/Platform.h"
 #include "third_party/WebKit/public/web/WebInputEvent.h"
+#include "ui/events/blink/input_handler_proxy_client.h"
+#include "ui/events/blink/input_scroll_elasticity_controller.h"
 #include "ui/events/latency_info.h"
 #include "ui/gfx/geometry/point_conversions.h"
 
 using blink::WebFloatPoint;
 using blink::WebFloatSize;
 using blink::WebGestureEvent;
 using blink::WebInputEvent;
 using blink::WebMouseEvent;
 using blink::WebMouseWheelEvent;
 using blink::WebPoint;
@@ skipping 137 matching lines @@
         break;
       default:
         NOTREACHED();
         break;
     }
   }
 }
 
 }  // namespace
 
-namespace content {
+namespace ui {
 
 InputHandlerProxy::InputHandlerProxy(cc::InputHandler* input_handler,
                                      InputHandlerProxyClient* client)
     : client_(client),
       input_handler_(input_handler),
       deferred_fling_cancel_time_seconds_(0),
       synchronous_input_handler_(nullptr),
       allow_root_animate_(true),
 #ifndef NDEBUG
       expect_scroll_update_end_(false),
 #endif
       gesture_scroll_on_impl_thread_(false),
       gesture_pinch_on_impl_thread_(false),
       fling_may_be_active_on_main_thread_(false),
       disallow_horizontal_fling_scroll_(false),
       disallow_vertical_fling_scroll_(false),
       has_fling_animation_started_(false),
+      smooth_scroll_enabled_(false),
       uma_latency_reporting_enabled_(base::TimeTicks::IsHighResolution()) {
   DCHECK(client);
   input_handler_->BindToClient(this);
-  smooth_scroll_enabled_ = base::CommandLine::ForCurrentProcess()->HasSwitch(
-      switches::kEnableSmoothScrolling);
   cc::ScrollElasticityHelper* scroll_elasticity_helper =
       input_handler_->CreateScrollElasticityHelper();
   if (scroll_elasticity_helper) {
     scroll_elasticity_controller_.reset(
         new InputScrollElasticityController(scroll_elasticity_helper));
   }
 }
 
 InputHandlerProxy::~InputHandlerProxy() {}
 
@@ skipping 20 matching lines @@
 
   scoped_ptr<cc::SwapPromiseMonitor> latency_info_swap_promise_monitor =
       input_handler_->CreateLatencyInfoSwapPromiseMonitor(latency_info);
   InputHandlerProxy::EventDisposition disposition = HandleInputEvent(event);
   return disposition;
 }
 
 InputHandlerProxy::EventDisposition InputHandlerProxy::HandleInputEvent(
     const WebInputEvent& event) {
   DCHECK(input_handler_);
-  TRACE_EVENT1("input,benchmark", "InputHandlerProxy::HandleInputEvent",
-               "type", WebInputEventTraits::GetName(event.type));

[tdresser, 2015/11/11 05:58:24]

Why did this trace disappear?

[Khushal, 2015/11/11 06:18:26]

WebInputEventTraits lives in content.

May be we move this trace to where the function call is made right now?
https://code.google.com/p/chromium/codesearch#chromium/src/content/renderer/i...

 
   if (FilterInputEventForFlingBoosting(event))
     return DID_HANDLE;
 
   switch (event.type) {
     case WebInputEvent::MouseWheel:
       return HandleMouseWheel(static_cast<const WebMouseWheelEvent&>(event));
 
     case WebInputEvent::GestureScrollBegin:
       return HandleGestureScrollBegin(
@@ skipping 607 matching lines @@
   if (!scroll_result.did_overscroll_root)
     return;
 
   TRACE_EVENT2("input",
                "InputHandlerProxy::DidOverscroll",
                "dx",
                scroll_result.unused_scroll_delta.x(),
                "dy",
                scroll_result.unused_scroll_delta.y());
 
-  DidOverscrollParams params;
-  params.accumulated_overscroll = scroll_result.accumulated_root_overscroll;
-  params.latest_overscroll_delta = scroll_result.unused_scroll_delta;
-  params.current_fling_velocity =
-      ToClientScrollIncrement(current_fling_velocity_);
-  params.causal_event_viewport_point = gfx::PointF(causal_event_viewport_point);
-
   if (fling_curve_) {
     static const int kFlingOverscrollThreshold = 1;
     disallow_horizontal_fling_scroll_ |=
-        std::abs(params.accumulated_overscroll.x()) >=
+        std::abs(scroll_result.accumulated_root_overscroll.x()) >=
         kFlingOverscrollThreshold;
     disallow_vertical_fling_scroll_ |=
-        std::abs(params.accumulated_overscroll.y()) >=
+        std::abs(scroll_result.accumulated_root_overscroll.y()) >=
         kFlingOverscrollThreshold;
   }
 
-  client_->DidOverscroll(params);
+  client_->DidOverscroll(scroll_result.accumulated_root_overscroll,
+                         scroll_result.unused_scroll_delta,
+                         ToClientScrollIncrement(current_fling_velocity_),
+                         gfx::PointF(causal_event_viewport_point));
 }
 
 bool InputHandlerProxy::CancelCurrentFling() {
   if (CancelCurrentFlingWithoutNotifyingClient()) {
     client_->DidStopFlinging();
     return true;
   }
   return false;
 }
 
@@ skipping 137 matching lines @@
   // It's possible the provided |increment| is sufficiently small as to not
   // trigger a scroll, e.g., with a trivial time delta between fling updates.
   // Return true in this case to prevent early fling termination.
   if (std::abs(clipped_increment.width) < kScrollEpsilon &&
       std::abs(clipped_increment.height) < kScrollEpsilon)
     return true;
 
   return did_scroll;
 }
 
-}  // namespace content
+}  // namespace ui