| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "content/browser/renderer_host/input/mouse_wheel_event_queue.h" | 5 #include "content/browser/renderer_host/input/mouse_wheel_event_queue.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <memory> | 9 #include <memory> |
| 10 #include <utility> | 10 #include <utility> |
| (...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 129 | 129 |
| 130 // MouseWheelEventQueueClient | 130 // MouseWheelEventQueueClient |
| 131 void SendMouseWheelEventImmediately( | 131 void SendMouseWheelEventImmediately( |
| 132 const MouseWheelEventWithLatencyInfo& event) override { | 132 const MouseWheelEventWithLatencyInfo& event) override { |
| 133 WebMouseWheelEvent* cloned_event = new WebMouseWheelEvent(); | 133 WebMouseWheelEvent* cloned_event = new WebMouseWheelEvent(); |
| 134 std::unique_ptr<WebInputEvent> cloned_event_holder(cloned_event); | 134 std::unique_ptr<WebInputEvent> cloned_event_holder(cloned_event); |
| 135 *cloned_event = event.event; | 135 *cloned_event = event.event; |
| 136 sent_events_.push_back(std::move(cloned_event_holder)); | 136 sent_events_.push_back(std::move(cloned_event_holder)); |
| 137 } | 137 } |
| 138 | 138 |
| 139 void ForwardGestureEvent(const blink::WebGestureEvent& event) override { | 139 void ForwardGestureEventWithLatencyInfo( |
| 140 const blink::WebGestureEvent& event, |
| 141 const ui::LatencyInfo& latency_info) override { |
| 140 WebGestureEvent* cloned_event = new WebGestureEvent(); | 142 WebGestureEvent* cloned_event = new WebGestureEvent(); |
| 141 std::unique_ptr<WebInputEvent> cloned_event_holder(cloned_event); | 143 std::unique_ptr<WebInputEvent> cloned_event_holder(cloned_event); |
| 142 *cloned_event = event; | 144 *cloned_event = event; |
| 143 sent_events_.push_back(std::move(cloned_event_holder)); | 145 sent_events_.push_back(std::move(cloned_event_holder)); |
| 144 } | 146 } |
| 145 | 147 |
| 146 void OnMouseWheelEventAck(const MouseWheelEventWithLatencyInfo& event, | 148 void OnMouseWheelEventAck(const MouseWheelEventWithLatencyInfo& event, |
| 147 InputEventAckState ack_result) override { | 149 InputEventAckState ack_result) override { |
| 148 ++acked_event_count_; | 150 ++acked_event_count_; |
| 149 last_acked_event_ = event.event; | 151 last_acked_event_ = event.event; |
| (...skipping 387 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 537 EXPECT_EQ(1U, GetAndResetAckedEventCount()); | 539 EXPECT_EQ(1U, GetAndResetAckedEventCount()); |
| 538 EXPECT_EQ(2U, all_sent_events().size()); | 540 EXPECT_EQ(2U, all_sent_events().size()); |
| 539 EXPECT_GESTURE_SCROLL_BEGIN(sent_gesture_event(0)); | 541 EXPECT_GESTURE_SCROLL_BEGIN(sent_gesture_event(0)); |
| 540 EXPECT_GESTURE_SCROLL_UPDATE(sent_gesture_event(1)); | 542 EXPECT_GESTURE_SCROLL_UPDATE(sent_gesture_event(1)); |
| 541 EXPECT_EQ(0U, sent_gesture_event(1)->data.scrollUpdate.deltaX); | 543 EXPECT_EQ(0U, sent_gesture_event(1)->data.scrollUpdate.deltaX); |
| 542 EXPECT_EQ(1U, sent_gesture_event(1)->data.scrollUpdate.deltaY); | 544 EXPECT_EQ(1U, sent_gesture_event(1)->data.scrollUpdate.deltaY); |
| 543 EXPECT_EQ(2U, GetAndResetSentEventCount()); | 545 EXPECT_EQ(2U, GetAndResetSentEventCount()); |
| 544 } | 546 } |
| 545 | 547 |
| 546 } // namespace content | 548 } // namespace content |
| OLD | NEW |