Bundle DidOverscrollParams with the InputEventAck

content/browser/renderer_host/input/input_router_impl_perftest.cc

 // Copyright 2014 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 "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "content/browser/renderer_host/input/input_ack_handler.h"
 #include "content/browser/renderer_host/input/input_router_client.h"
 #include "content/browser/renderer_host/input/input_router_impl.h"
 #include "content/common/input/web_input_event_traits.h"
@@ skipping 64 matching lines @@
     return INPUT_EVENT_ACK_STATE_NOT_CONSUMED;
   }
   virtual void IncrementInFlightEventCount() OVERRIDE {}
   virtual void DecrementInFlightEventCount() OVERRIDE {}
   virtual void OnHasTouchEventHandlers(bool has_handlers) OVERRIDE {}
   virtual OverscrollController* GetOverscrollController() const OVERRIDE {
     return NULL;
   }
   virtual void DidFlush() OVERRIDE {}
   virtual void SetNeedsFlush() OVERRIDE {}
+  virtual void DidOverscroll(const DidOverscrollParams& params) OVERRIDE {}
 };
 
 class NullIPCSender : public IPC::Sender {
  public:
   NullIPCSender() : sent_count_(0) {}
   virtual ~NullIPCSender() {}
 
   virtual bool Send(IPC::Message* message) OVERRIDE {
     delete message;
     ++sent_count_;
@@ skipping 135 matching lines @@
   }
 
   void SendEvent(const WebTouchEvent& touch, const ui::LatencyInfo& latency) {
     input_router_->SendTouchEvent(TouchEventWithLatencyInfo(touch, latency));
   }
 
   void SendEventAckIfNecessary(const blink::WebInputEvent& event,
                                InputEventAckState ack_result) {
     if (WebInputEventTraits::IgnoresAckDisposition(event))
       return;
-    InputHostMsg_HandleInputEvent_ACK response(
-        0, event.type, ack_result, ui::LatencyInfo());
+    InputHostMsg_HandleInputEvent_ACK_Params ack;
+    ack.type = event.type;
+    ack.state = ack_result;
+    InputHostMsg_HandleInputEvent_ACK response(0, ack);
     input_router_->OnMessageReceived(response);
   }
 
   void OnHasTouchEventHandlers(bool has_handlers) {
     input_router_->OnMessageReceived(
         ViewHostMsg_HasTouchEventHandlers(0, has_handlers));
   }
 
   size_t GetAndResetSentEventCount() {
     return sender_->GetAndResetSentEventCount();
@@ skipping 126 matching lines @@
 
 TEST_F(InputRouterImplPerfTest, TouchSwipeToGestureScroll) {
   SimulateTouchAndScrollEventSequence("TouchSwipeToGestureScroll ",
                                       kDefaultSteps,
                                       kDefaultOrigin,
                                       kDefaultDistance,
                                       kDefaultIterations);
 }
 
 }  // namespace content