Allow MainThreadEventQueue to call the RenderWidget directly.

content/renderer/input/render_widget_input_handler.cc

 // Copyright 2015 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/render_widget_input_handler.h"
 
 #include <stddef.h>
 #include <stdint.h>
 #include <utility>
 
@@ skipping 189 matching lines @@
       handling_event_type_(WebInputEvent::kUndefined),
       context_menu_source_type_(ui::MENU_SOURCE_MOUSE),
       suppress_next_char_events_(false) {
   DCHECK(delegate);
   DCHECK(widget);
   delegate->SetInputHandler(this);
 }
 
 RenderWidgetInputHandler::~RenderWidgetInputHandler() {}
 
-void RenderWidgetInputHandler::HandleInputEvent(
+InputEventAckState RenderWidgetInputHandler::HandleInputEvent(
     const blink::WebCoalescedInputEvent& coalesced_event,
     const ui::LatencyInfo& latency_info,
     InputEventDispatchType dispatch_type) {
   const WebInputEvent& input_event = coalesced_event.Event();
   base::AutoReset<bool> handling_input_event_resetter(&handling_input_event_,
                                                       true);
   base::AutoReset<WebInputEvent::Type> handling_event_type_resetter(
       &handling_event_type_, input_event.GetType());
 
   // Calls into |didOverscroll()| while handling this event will populate
@@ skipping 165 matching lines @@
       delegate_->ObserveGestureEventAndResult(
           gesture_event,
           event_overscroll ? event_overscroll->latest_overscroll_delta
                            : gfx::Vector2dF(),
           processed != WebInputEventResult::kNotHandled);
     }
   }
 
   TRACE_EVENT_SYNTHETIC_DELAY_END("blink.HandleInputEvent");
 
-  if (dispatch_type == DISPATCH_TYPE_BLOCKING_NOTIFY_MAIN ||
-      dispatch_type == DISPATCH_TYPE_NON_BLOCKING_NOTIFY_MAIN) {
-    // |non_blocking| means it was ack'd already by the InputHandlerProxy
-    // so let the delegate know the event has been handled.
-    delegate_->NotifyInputEventHandled(input_event.GetType(), processed,
-                                       ack_result);
-  }
-
-  if ((dispatch_type == DISPATCH_TYPE_BLOCKING ||
-       dispatch_type == DISPATCH_TYPE_BLOCKING_NOTIFY_MAIN)) {
+  if (dispatch_type == DISPATCH_TYPE_BLOCKING) {
     std::unique_ptr<InputEventAck> response(new InputEventAck(
         InputEventAckSource::MAIN_THREAD, input_event.GetType(), ack_result,
         swap_latency_info, std::move(event_overscroll),
         ui::WebInputEventTraits::GetUniqueTouchEventId(input_event)));
     delegate_->OnInputEventAck(std::move(response));
   } else {
     DCHECK(!event_overscroll) << "Unexpected overscroll for un-acked event";
   }
   if (RenderThreadImpl::current()) {
     RenderThreadImpl::current()
@@ skipping 25 matching lines @@
 // TODO(rouslan): Fix ChromeOS and Windows 8 behavior of autofill popup with
 // virtual keyboard.
 #if !defined(OS_ANDROID)
   // Virtual keyboard is not supported, so react to focus change immediately.
   if (processed != WebInputEventResult::kNotHandled &&
       (input_event.GetType() == WebInputEvent::kTouchEnd ||
        input_event.GetType() == WebInputEvent::kMouseUp)) {
     delegate_->FocusChangeComplete();
   }
 #endif
+  return ack_result;
 }
 
 void RenderWidgetInputHandler::DidOverscrollFromBlink(
     const WebFloatSize& overscrollDelta,
     const WebFloatSize& accumulatedOverscroll,
     const WebFloatPoint& position,
     const WebFloatSize& velocity) {
   std::unique_ptr<DidOverscrollParams> params(new DidOverscrollParams());
   params->accumulated_overscroll = gfx::Vector2dF(
       accumulatedOverscroll.width, accumulatedOverscroll.height);
   params->latest_overscroll_delta =
       gfx::Vector2dF(overscrollDelta.width, overscrollDelta.height);
   params->current_fling_velocity =
       gfx::Vector2dF(velocity.width, velocity.height);
   params->causal_event_viewport_point = gfx::PointF(position.x, position.y);
 
   // If we're currently handling an event, stash the overscroll data such that
   // it can be bundled in the event ack.
   if (handling_event_overscroll_) {
     *handling_event_overscroll_ = std::move(params);
     return;
   }
 
   delegate_->OnDidOverscroll(*params);
 }
 
 }  // namespace content