Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1341)

Unified Diff: content/browser/renderer_host/input/mouse_wheel_event_queue_unittest.cc

Issue 2785533003: Animated scroll shouldn't consume unhandled scrolls for OOPIFs. (Closed)
Patch Set: Fix Android compile. Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/renderer_host/input/mouse_wheel_event_queue_unittest.cc
diff --git a/content/browser/renderer_host/input/mouse_wheel_event_queue_unittest.cc b/content/browser/renderer_host/input/mouse_wheel_event_queue_unittest.cc
index 5df6e0204cdf2d3539e047b3f84706d8d63927e5..38521f78fe3a79a60442db9d523324c843e6bb9f 100644
--- a/content/browser/renderer_host/input/mouse_wheel_event_queue_unittest.cc
+++ b/content/browser/renderer_host/input/mouse_wheel_event_queue_unittest.cc
@@ -141,7 +141,8 @@ class MouseWheelEventQueueTest : public testing::TestWithParam<bool>,
public:
MouseWheelEventQueueTest()
: acked_event_count_(0),
- last_acked_event_state_(INPUT_EVENT_ACK_STATE_UNKNOWN) {
+ last_acked_event_state_(INPUT_EVENT_ACK_STATE_UNKNOWN),
+ is_in_gesture_scroll_(false) {
scroll_latching_enabled_ = GetParam();
queue_.reset(new MouseWheelEventQueue(this, scroll_latching_enabled_));
scroll_end_timeout_ms_ = scroll_latching_enabled_ ? 100 : 0;
@@ -165,8 +166,18 @@ class MouseWheelEventQueueTest : public testing::TestWithParam<bool>,
std::unique_ptr<WebInputEvent> cloned_event_holder(cloned_event);
*cloned_event = event;
sent_events_.push_back(std::move(cloned_event_holder));
+
+ if (event.GetType() == blink::WebInputEvent::kGestureScrollBegin &&
+ !event.data.scroll_begin.synthetic) {
+ is_in_gesture_scroll_ = true;
+ } else if (event.GetType() == blink::WebInputEvent::kGestureScrollEnd &&
+ !event.data.scroll_end.synthetic) {
+ is_in_gesture_scroll_ = false;
+ }
}
+ bool is_in_gesture_scroll() override { return is_in_gesture_scroll_; }
+
void OnMouseWheelEventAck(const MouseWheelEventWithLatencyInfo& event,
InputEventAckState ack_result) override {
++acked_event_count_;
@@ -452,6 +463,7 @@ class MouseWheelEventQueueTest : public testing::TestWithParam<bool>,
WebMouseWheelEvent last_acked_event_;
int64_t scroll_end_timeout_ms_;
bool scroll_latching_enabled_;
+ bool is_in_gesture_scroll_;
};
// Tests that mouse wheel events are queued properly.

Powered by Google App Engine
This is Rietveld 408576698