Remove is_fling flag for fling intervention

content/renderer/input/input_handler_manager.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_manager.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/location.h"
@@ skipping 17 matching lines @@
 
 namespace {
 
 InputEventAckState InputEventDispositionToAck(
     InputHandlerProxy::EventDisposition disposition) {
   switch (disposition) {
     case InputHandlerProxy::DID_HANDLE:
       return INPUT_EVENT_ACK_STATE_CONSUMED;
     case InputHandlerProxy::DID_NOT_HANDLE:
       return INPUT_EVENT_ACK_STATE_NOT_CONSUMED;
+    case InputHandlerProxy::DID_NOT_HANDLE_NON_BLOCKING:
+      return INPUT_EVENT_ACK_STATE_NOT_CONSUMED_NON_BLOCKING;
     case InputHandlerProxy::DROP_EVENT:
       return INPUT_EVENT_ACK_STATE_NO_CONSUMER_EXISTS;
     case InputHandlerProxy::DID_HANDLE_NON_BLOCKING:
       return INPUT_EVENT_ACK_STATE_SET_NON_BLOCKING;
   }
   NOTREACHED();
   return INPUT_EVENT_ACK_STATE_UNKNOWN;
 }
 
 } // namespace
@@ skipping 185 matching lines @@
     std::unique_ptr<ui::DidOverscrollParams> overscroll_params) {
   InputEventAckState input_event_ack_state =
       InputEventDispositionToAck(event_disposition);
   switch (input_event_ack_state) {
     case INPUT_EVENT_ACK_STATE_CONSUMED:
       renderer_scheduler_->DidHandleInputEventOnCompositorThread(
           *input_event,
           RendererScheduler::InputEventState::EVENT_CONSUMED_BY_COMPOSITOR);
       break;
     case INPUT_EVENT_ACK_STATE_NOT_CONSUMED:
+    case INPUT_EVENT_ACK_STATE_NOT_CONSUMED_NON_BLOCKING:
       renderer_scheduler_->DidHandleInputEventOnCompositorThread(
           *input_event,
           RendererScheduler::InputEventState::EVENT_FORWARDED_TO_MAIN_THREAD);
       break;
     default:
       break;
   }
   callback.Run(input_event_ack_state, std::move(input_event), latency_info,
                std::move(overscroll_params));
 }
 
 void InputHandlerManager::DidOverscroll(int routing_id,
                                         const ui::DidOverscrollParams& params) {
   client_->DidOverscroll(routing_id, params);
 }
 
-void InputHandlerManager::DidStartFlinging(int routing_id) {
-  client_->DidStartFlinging(routing_id);
-}
-
 void InputHandlerManager::DidStopFlinging(int routing_id) {
   client_->DidStopFlinging(routing_id);
 }
 
 void InputHandlerManager::DidAnimateForInput() {
   renderer_scheduler_->DidAnimateForInputOnCompositorThread();
 }
 
 void InputHandlerManager::NeedsMainFrame(int routing_id) {
   DCHECK(task_runner_->BelongsToCurrentThread());
   auto it = input_handlers_.find(routing_id);
   if (it == input_handlers_.end())
     return;
   it->second->NeedsMainFrame();
 }
 
 void InputHandlerManager::DispatchNonBlockingEventToMainThread(
     int routing_id,
     ui::ScopedWebInputEvent event,
     const ui::LatencyInfo& latency_info) {
   DCHECK(task_runner_->BelongsToCurrentThread());
   client_->DispatchNonBlockingEventToMainThread(routing_id, std::move(event),
                                                 latency_info);
 }
 
 }  // namespace content