Explicit interface for synchronous InputHandlerProxy input handling

content/renderer/gpu/input_handler_manager.cc

 // Copyright (c) 2012 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/gpu/input_handler_manager.h"
 
 #include "base/bind.h"
 #include "base/debug/trace_event.h"
 #include "cc/input/input_handler.h"
 #include "content/renderer/gpu/input_event_filter.h"
 #include "content/renderer/gpu/input_handler_wrapper.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebActiveWheelFlingParameters.h"
 
 using WebKit::WebInputEvent;
 
 namespace content {
 
+namespace {
+
+InputEventAckState InputEventDispositionToAck(
+    InputHandlerProxy::EventDisposition disposition) {
+  switch (disposition) {
+    case InputHandlerProxy::DidHandle:
+      return INPUT_EVENT_ACK_STATE_CONSUMED;
+    case InputHandlerProxy::DidNotHandle:
+      return INPUT_EVENT_ACK_STATE_NOT_CONSUMED;
+    case InputHandlerProxy::DropEvent:
+      return INPUT_EVENT_ACK_STATE_NO_CONSUMER_EXISTS;
+    default:

[jamesr, 2013/06/03 20:45:59]

i would omit the default: so the compiler yells at you if one of the enum values
is not handled and put the NOTREACHED()/return outside of the switch

[jdduke (slow), 2013/06/03 21:40:42]

I like it, done.

+      NOTREACHED();
+      return INPUT_EVENT_ACK_STATE_UNKNOWN;
+  }
+}
+
+} // namespace
+
 InputHandlerManager::InputHandlerManager(
     IPC::Listener* main_listener,
     const scoped_refptr<base::MessageLoopProxy>& message_loop_proxy)
     : message_loop_proxy_(message_loop_proxy) {
   filter_ =
       new InputEventFilter(main_listener,
                            message_loop_proxy,
                            base::Bind(&InputHandlerManager::HandleInputEvent,
                                       base::Unretained(this)));
 }
@@ skipping 46 matching lines @@
 
 void InputHandlerManager::RemoveInputHandler(int routing_id) {
   DCHECK(message_loop_proxy_->BelongsToCurrentThread());
 
   TRACE_EVENT0("InputHandlerManager::RemoveInputHandler", "RemovingRoute");
 
   filter_->RemoveRoute(routing_id);
   input_handlers_.erase(routing_id);
 }
 
-void InputHandlerManager::HandleInputEvent(
+InputEventAckState InputHandlerManager::HandleInputEvent(
     int routing_id,
     const WebInputEvent* input_event) {
   DCHECK(message_loop_proxy_->BelongsToCurrentThread());
 
   InputHandlerMap::iterator it = input_handlers_.find(routing_id);
   if (it == input_handlers_.end()) {
     TRACE_EVENT0("InputHandlerManager::HandleInputEvent",
                  "NoInputHandlerFound");
     // Oops, we no longer have an interested input handler..
-    filter_->DidNotHandleInputEvent(true);
-    return;
+    return INPUT_EVENT_ACK_STATE_NOT_CONSUMED;
   }
 
-  it->second->input_handler_proxy()->HandleInputEvent(*input_event);
+  return InputEventDispositionToAck(
+      it->second->input_handler_proxy()->HandleInputEvent(*input_event));
 }
 
 }  // namespace content