Refactor compositor event handling path to be callback-based

content/renderer/mus/compositor_mus_connection_unittest.cc

 // Copyright 2016 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/mus/compositor_mus_connection.h"
 
 #include <memory>
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
@@ skipping 61 matching lines @@
         result_(content::InputEventAckState::INPUT_EVENT_ACK_STATE_UNKNOWN) {}
   ~TestInputHandlerManager() override {}
 
   // Stops overriding the behaviour of HandleInputEvent
   void ClearHandleInputEventOverride();
 
   // Overrides the behaviour of HandleInputEvent, returing |result|.
   void SetHandleInputEventResult(content::InputEventAckState result);
 
   // content::InputHandlerManager:
-  content::InputEventAckState HandleInputEvent(
-      int routing_id,
-      const blink::WebInputEvent* input_event,
-      ui::LatencyInfo* latency_info) override;
+  void HandleInputEvent(int routing_id,
+                        ui::ScopedWebInputEvent input_event,
+                        const ui::LatencyInfo& latency_info,
+                        const InputEventAckStateCallback& callback) override;
 
  private:
   // If true content::InputHandlerManager::HandleInputEvent is not called.
   bool override_result_;
 
   // The result to return in HandleInputEvent if |override_result_|.
   content::InputEventAckState result_;
 
   DISALLOW_COPY_AND_ASSIGN(TestInputHandlerManager);
 };
 
 void TestInputHandlerManager::ClearHandleInputEventOverride() {
   override_result_ = false;
 }
 
 void TestInputHandlerManager::SetHandleInputEventResult(
     content::InputEventAckState result) {
   override_result_ = true;
   result_ = result;
 }
 
-content::InputEventAckState TestInputHandlerManager::HandleInputEvent(
+void TestInputHandlerManager::HandleInputEvent(
     int routing_id,
-    const blink::WebInputEvent* input_event,
-    ui::LatencyInfo* latency_info) {
-  if (override_result_)
-    return result_;
-  return content::InputHandlerManager::HandleInputEvent(routing_id, input_event,
-                                                        latency_info);
+    ui::ScopedWebInputEvent input_event,
+    const ui::LatencyInfo& latency_info,
+    const InputEventAckStateCallback& callback) {
+  if (override_result_) {
+    callback.Run(result_, std::move(input_event), latency_info, nullptr);
+    return;
+  }
+  content::InputHandlerManager::HandleInputEvent(
+      routing_id, std::move(input_event), latency_info, callback);
 }
 
 // Empty implementation of InputHandlerManagerClient.
 class TestInputHandlerManagerClient
     : public content::InputHandlerManagerClient {
  public:
   TestInputHandlerManagerClient() {}
   ~TestInputHandlerManagerClient() override{};
 
   // content::InputHandlerManagerClient:
   void SetBoundHandler(const Handler& handler) override {}
   void RegisterRoutingID(int routing_id) override {}
   void UnregisterRoutingID(int routing_id) override {}
   void DidOverscroll(int routing_id,
-                     const ui::DidOverscrollParams& params) override {}
+                     const ui::DidOverscrollParams& params,
+                     bool bundle_ack_with_triggering_event) override {}
   void DidStartFlinging(int routing_id) override {}
   void DidStopFlinging(int routing_id) override {}
   void NotifyInputEventHandled(
       int routing_id,
       blink::WebInputEvent::Type type,
       content::InputEventAckState ack_result) override {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TestInputHandlerManagerClient);
 };
@@ skipping 273 matching lines @@
 
   VerifyAndRunQueues(true, true);
 
   // Only the most recent ack was called.
   EXPECT_FALSE(test_callback1->called());
   EXPECT_TRUE(test_callback2->called());
   EXPECT_EQ(EventResult::HANDLED, test_callback2->result());
 }
 
 // Tests that when an input handler consumes the event, that
-// CompositorMusConnection does not consume the ack, nor calls it.
+// CompositorMusConnection will consume the ack, but call as UNHANDLED.
 TEST_F(CompositorMusConnectionTest, InputHandlerConsumes) {
   input_handler_manager()->SetHandleInputEventResult(
       InputEventAckState::INPUT_EVENT_ACK_STATE_CONSUMED);
   ui::TestWindow test_window;
   std::unique_ptr<ui::Event> event(GenerateKeyEvent());
   scoped_refptr<TestCallback> test_callback(new TestCallback);
   std::unique_ptr<base::Callback<void(EventResult)>> ack_callback(
       new base::Callback<void(EventResult)>(
           base::Bind(&::TestCallback::ResultCallback, test_callback)));
 
   OnWindowInputEvent(&test_window, *event.get(), &ack_callback);
 
-  EXPECT_TRUE(ack_callback.get());
+  EXPECT_FALSE(ack_callback.get());
   VerifyAndRunQueues(false, false);
-  EXPECT_FALSE(test_callback->called());
+  EXPECT_TRUE(test_callback->called());
+  EXPECT_EQ(EventResult::UNHANDLED, test_callback->result());

[chongz, 2016/08/23 04:35:24]

Changed behavior since |CompositorMusConnection::OnWindowInputEvent| has to
always take ownership, but it can pass back |EventResult::UNHANDLED| in these
case.

 }
 
 // Tests that when the renderer will not ack an event, that
-// CompositorMusConnection does not consume the ack, nor calls it.
+// CompositorMusConnection will consume the ack, but call as UNHANDLED.
 TEST_F(CompositorMusConnectionTest, RendererWillNotSendAck) {
   ui::TestWindow test_window;
   ui::PointerEvent event(
       ui::ET_POINTER_DOWN, gfx::Point(), gfx::Point(), ui::EF_NONE, 0,
       ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE),
       ui::EventTimeForNow());
 
   scoped_refptr<TestCallback> test_callback(new TestCallback);
   std::unique_ptr<base::Callback<void(EventResult)>> ack_callback(
       new base::Callback<void(EventResult)>(
           base::Bind(&::TestCallback::ResultCallback, test_callback)));
 
   OnWindowInputEvent(&test_window, event, &ack_callback);
-  EXPECT_TRUE(ack_callback.get());
+  EXPECT_FALSE(ack_callback.get());
 
   VerifyAndRunQueues(true, false);
-  EXPECT_FALSE(test_callback->called());
+  EXPECT_TRUE(test_callback->called());
+  EXPECT_EQ(EventResult::UNHANDLED, test_callback->result());
 }
 
 // Tests that when a touch event id provided, that CompositorMusConnection
 // consumes the ack.
 TEST_F(CompositorMusConnectionTest, TouchEventConsumed) {
   TestRenderWidgetInputHandler* input_handler = render_widget_input_handler();
   input_handler->set_delegate(connection());
   input_handler->set_state(InputEventAckState::INPUT_EVENT_ACK_STATE_CONSUMED);
 
   ui::TestWindow test_window;
@@ skipping 13 matching lines @@
   EXPECT_FALSE(ack_callback.get());
 
   VerifyAndRunQueues(true, true);
 
   // The ack callback should have been called
   EXPECT_TRUE(test_callback->called());
   EXPECT_EQ(EventResult::HANDLED, test_callback->result());
 }
 
 }  // namespace content