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

Side by Side Diff: content/browser/renderer_host/input/mouse_wheel_event_queue_unittest.cc

Issue 2256733003: Touchpad scroll latching enabled for Mac behind flag. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: ClearCurrentlyScrollingLayerForTesting added. Created 4 years, 3 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 unified diff | Download patch
OLDNEW
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 300 matching lines...) Expand 10 before | Expand all | Expand 10 after
311 const WebGestureEvent::ScrollUnits scroll_units = 311 const WebGestureEvent::ScrollUnits scroll_units =
312 high_precision ? WebGestureEvent::PrecisePixels 312 high_precision ? WebGestureEvent::PrecisePixels
313 : WebGestureEvent::Pixels; 313 : WebGestureEvent::Pixels;
314 314
315 SendMouseWheelWithPhase(kWheelScrollX, kWheelScrollY, kWheelScrollGlobalX, 315 SendMouseWheelWithPhase(kWheelScrollX, kWheelScrollY, kWheelScrollGlobalX,
316 kWheelScrollGlobalY, 1, 1, 0, high_precision, 316 kWheelScrollGlobalY, 1, 1, 0, high_precision,
317 WebMouseWheelEvent::PhaseBegan, 317 WebMouseWheelEvent::PhaseBegan,
318 WebMouseWheelEvent::PhaseNone); 318 WebMouseWheelEvent::PhaseNone);
319 EXPECT_EQ(1U, GetAndResetSentEventCount()); 319 EXPECT_EQ(1U, GetAndResetSentEventCount());
320 SendMouseWheelEventAck(INPUT_EVENT_ACK_STATE_NOT_CONSUMED); 320 SendMouseWheelEventAck(INPUT_EVENT_ACK_STATE_NOT_CONSUMED);
321 EXPECT_EQ(3U, all_sent_events().size()); 321 if (scroll_latching_enabled_) {
322 EXPECT_GESTURE_SCROLL_BEGIN_WITH_PHASE(sent_gesture_event(0)); 322 EXPECT_EQ(2U, all_sent_events().size());
323 EXPECT_GESTURE_SCROLL_UPDATE_WITH_PHASE(sent_gesture_event(1)); 323 EXPECT_GESTURE_SCROLL_BEGIN_WITH_PHASE(sent_gesture_event(0));
324 EXPECT_SYNTHETIC_GESTURE_SCROLL_END(sent_gesture_event(2)); 324 EXPECT_GESTURE_SCROLL_UPDATE_WITH_PHASE(sent_gesture_event(1));
325 EXPECT_EQ(3U, GetAndResetSentEventCount()); 325 EXPECT_EQ(2U, GetAndResetSentEventCount());
326 } else {
327 EXPECT_EQ(3U, all_sent_events().size());
328 EXPECT_GESTURE_SCROLL_BEGIN_WITH_PHASE(sent_gesture_event(0));
329 EXPECT_GESTURE_SCROLL_UPDATE_WITH_PHASE(sent_gesture_event(1));
330 EXPECT_SYNTHETIC_GESTURE_SCROLL_END(sent_gesture_event(2));
331 EXPECT_EQ(3U, GetAndResetSentEventCount());
332 }
326 333
327 SendMouseWheelWithPhase(kWheelScrollX, kWheelScrollY, kWheelScrollGlobalX, 334 SendMouseWheelWithPhase(kWheelScrollX, kWheelScrollY, kWheelScrollGlobalX,
328 kWheelScrollGlobalY, 5, 5, 0, high_precision, 335 kWheelScrollGlobalY, 5, 5, 0, high_precision,
329 WebMouseWheelEvent::PhaseChanged, 336 WebMouseWheelEvent::PhaseChanged,
330 WebMouseWheelEvent::PhaseNone); 337 WebMouseWheelEvent::PhaseNone);
331 EXPECT_EQ(1U, GetAndResetSentEventCount()); 338 EXPECT_EQ(1U, GetAndResetSentEventCount());
332 SendMouseWheelEventAck(INPUT_EVENT_ACK_STATE_NOT_CONSUMED); 339 SendMouseWheelEventAck(INPUT_EVENT_ACK_STATE_NOT_CONSUMED);
333 EXPECT_EQ(3U, all_sent_events().size()); 340 if (scroll_latching_enabled_) {
334 EXPECT_SYNTHETIC_GESTURE_SCROLL_BEGIN(sent_gesture_event(0)); 341 EXPECT_EQ(1U, all_sent_events().size());
335 EXPECT_GESTURE_SCROLL_UPDATE_WITH_PHASE(sent_gesture_event(1)); 342 EXPECT_GESTURE_SCROLL_UPDATE_WITH_PHASE(sent_gesture_event(0));
336 EXPECT_SYNTHETIC_GESTURE_SCROLL_END(sent_gesture_event(2)); 343 EXPECT_EQ(1U, GetAndResetSentEventCount());
337 EXPECT_EQ(3U, GetAndResetSentEventCount()); 344 } else {
338 345 EXPECT_EQ(3U, all_sent_events().size());
346 EXPECT_SYNTHETIC_GESTURE_SCROLL_BEGIN(sent_gesture_event(0));
347 EXPECT_GESTURE_SCROLL_UPDATE_WITH_PHASE(sent_gesture_event(1));
348 EXPECT_SYNTHETIC_GESTURE_SCROLL_END(sent_gesture_event(2));
349 EXPECT_EQ(3U, GetAndResetSentEventCount());
350 }
339 SendMouseWheelWithPhase(kWheelScrollX, kWheelScrollY, kWheelScrollGlobalX, 351 SendMouseWheelWithPhase(kWheelScrollX, kWheelScrollY, kWheelScrollGlobalX,
340 kWheelScrollGlobalY, 0, 0, 0, high_precision, 352 kWheelScrollGlobalY, 0, 0, 0, high_precision,
341 WebMouseWheelEvent::PhaseEnded, 353 WebMouseWheelEvent::PhaseEnded,
342 WebMouseWheelEvent::PhaseNone); 354 WebMouseWheelEvent::PhaseNone);
343 EXPECT_EQ(1U, GetAndResetSentEventCount()); 355 EXPECT_EQ(1U, GetAndResetSentEventCount());
344 SendMouseWheelEventAck(INPUT_EVENT_ACK_STATE_NOT_CONSUMED); 356 SendMouseWheelEventAck(INPUT_EVENT_ACK_STATE_NOT_CONSUMED);
345 EXPECT_EQ(2U, all_sent_events().size()); 357 if (scroll_latching_enabled_) {
346 EXPECT_SYNTHETIC_GESTURE_SCROLL_BEGIN(sent_gesture_event(0)); 358 EXPECT_EQ(1U, all_sent_events().size());
347 EXPECT_GESTURE_SCROLL_END_WITH_PHASE(sent_gesture_event(1)); 359 EXPECT_GESTURE_SCROLL_END_WITH_PHASE(sent_gesture_event(0));
348 EXPECT_EQ(2U, GetAndResetSentEventCount()); 360 EXPECT_EQ(1U, GetAndResetSentEventCount());
361 } else {
362 EXPECT_EQ(2U, all_sent_events().size());
363 EXPECT_SYNTHETIC_GESTURE_SCROLL_BEGIN(sent_gesture_event(0));
364 EXPECT_GESTURE_SCROLL_END_WITH_PHASE(sent_gesture_event(1));
365 EXPECT_EQ(2U, GetAndResetSentEventCount());
366 }
349 367
350 // Send a double phase end; OSX does it consistently. 368 // Send a double phase end; OSX does it consistently.
351 SendMouseWheelWithPhase(kWheelScrollX, kWheelScrollY, kWheelScrollGlobalX, 369 SendMouseWheelWithPhase(kWheelScrollX, kWheelScrollY, kWheelScrollGlobalX,
352 kWheelScrollGlobalY, 0, 0, 0, high_precision, 370 kWheelScrollGlobalY, 0, 0, 0, high_precision,
353 WebMouseWheelEvent::PhaseEnded, 371 WebMouseWheelEvent::PhaseEnded,
354 WebMouseWheelEvent::PhaseNone); 372 WebMouseWheelEvent::PhaseNone);
355 EXPECT_EQ(1U, GetAndResetSentEventCount()); 373 EXPECT_EQ(1U, GetAndResetSentEventCount());
356 SendMouseWheelEventAck(INPUT_EVENT_ACK_STATE_NOT_CONSUMED); 374 SendMouseWheelEventAck(INPUT_EVENT_ACK_STATE_NOT_CONSUMED);
357 EXPECT_EQ(0U, all_sent_events().size()); 375 EXPECT_EQ(0U, all_sent_events().size());
358 EXPECT_EQ(0U, GetAndResetSentEventCount()); 376 EXPECT_EQ(0U, GetAndResetSentEventCount());
359 377
360 SendMouseWheelWithPhase(kWheelScrollX, kWheelScrollY, kWheelScrollGlobalX, 378 SendMouseWheelWithPhase(kWheelScrollX, kWheelScrollY, kWheelScrollGlobalX,
361 kWheelScrollGlobalY, 5, 5, 0, high_precision, 379 kWheelScrollGlobalY, 5, 5, 0, high_precision,
362 WebMouseWheelEvent::PhaseNone, 380 WebMouseWheelEvent::PhaseNone,
363 WebMouseWheelEvent::PhaseBegan); 381 WebMouseWheelEvent::PhaseBegan);
364 EXPECT_EQ(1U, GetAndResetSentEventCount()); 382 EXPECT_EQ(1U, GetAndResetSentEventCount());
365 SendMouseWheelEventAck(INPUT_EVENT_ACK_STATE_NOT_CONSUMED); 383 SendMouseWheelEventAck(INPUT_EVENT_ACK_STATE_NOT_CONSUMED);
366 EXPECT_EQ(3U, all_sent_events().size()); 384 if (scroll_latching_enabled_) {
367 EXPECT_INERTIAL_GESTURE_SCROLL_BEGIN(sent_gesture_event(0)); 385 EXPECT_EQ(2U, all_sent_events().size());
368 EXPECT_INERTIAL_GESTURE_SCROLL_UPDATE(sent_gesture_event(1)); 386 EXPECT_INERTIAL_GESTURE_SCROLL_BEGIN(sent_gesture_event(0));
369 EXPECT_SYNTHETIC_INERTIAL_GESTURE_SCROLL_END(sent_gesture_event(2)); 387 EXPECT_INERTIAL_GESTURE_SCROLL_UPDATE(sent_gesture_event(1));
370 EXPECT_EQ(3U, GetAndResetSentEventCount()); 388 EXPECT_EQ(2U, GetAndResetSentEventCount());
389 } else {
390 EXPECT_EQ(3U, all_sent_events().size());
391 EXPECT_INERTIAL_GESTURE_SCROLL_BEGIN(sent_gesture_event(0));
392 EXPECT_INERTIAL_GESTURE_SCROLL_UPDATE(sent_gesture_event(1));
393 EXPECT_SYNTHETIC_INERTIAL_GESTURE_SCROLL_END(sent_gesture_event(2));
394 EXPECT_EQ(3U, GetAndResetSentEventCount());
395 }
371 396
372 SendMouseWheelWithPhase(kWheelScrollX, kWheelScrollY, kWheelScrollGlobalX, 397 SendMouseWheelWithPhase(kWheelScrollX, kWheelScrollY, kWheelScrollGlobalX,
373 kWheelScrollGlobalY, 5, 5, 0, high_precision, 398 kWheelScrollGlobalY, 5, 5, 0, high_precision,
374 WebMouseWheelEvent::PhaseNone, 399 WebMouseWheelEvent::PhaseNone,
375 WebMouseWheelEvent::PhaseChanged); 400 WebMouseWheelEvent::PhaseChanged);
376 EXPECT_EQ(1U, GetAndResetSentEventCount()); 401 EXPECT_EQ(1U, GetAndResetSentEventCount());
377 SendMouseWheelEventAck(INPUT_EVENT_ACK_STATE_NOT_CONSUMED); 402 SendMouseWheelEventAck(INPUT_EVENT_ACK_STATE_NOT_CONSUMED);
378 EXPECT_EQ(3U, all_sent_events().size()); 403 if (scroll_latching_enabled_) {
379 EXPECT_SYNTHETIC_INERTIAL_GESTURE_SCROLL_BEGIN(sent_gesture_event(0)); 404 EXPECT_EQ(1U, all_sent_events().size());
380 EXPECT_INERTIAL_GESTURE_SCROLL_UPDATE(sent_gesture_event(1)); 405 EXPECT_INERTIAL_GESTURE_SCROLL_UPDATE(sent_gesture_event(0));
381 EXPECT_SYNTHETIC_INERTIAL_GESTURE_SCROLL_END(sent_gesture_event(2)); 406 EXPECT_EQ(1U, GetAndResetSentEventCount());
382 EXPECT_EQ(3U, GetAndResetSentEventCount()); 407 } else {
408 EXPECT_EQ(3U, all_sent_events().size());
409 EXPECT_SYNTHETIC_INERTIAL_GESTURE_SCROLL_BEGIN(sent_gesture_event(0));
410 EXPECT_INERTIAL_GESTURE_SCROLL_UPDATE(sent_gesture_event(1));
411 EXPECT_SYNTHETIC_INERTIAL_GESTURE_SCROLL_END(sent_gesture_event(2));
412 EXPECT_EQ(3U, GetAndResetSentEventCount());
413 }
383 414
384 SendMouseWheelWithPhase(kWheelScrollX, kWheelScrollY, kWheelScrollGlobalX, 415 SendMouseWheelWithPhase(kWheelScrollX, kWheelScrollY, kWheelScrollGlobalX,
385 kWheelScrollGlobalY, 0, 0, 0, high_precision, 416 kWheelScrollGlobalY, 0, 0, 0, high_precision,
386 WebMouseWheelEvent::PhaseNone, 417 WebMouseWheelEvent::PhaseNone,
387 WebMouseWheelEvent::PhaseEnded); 418 WebMouseWheelEvent::PhaseEnded);
388 EXPECT_EQ(1U, GetAndResetSentEventCount()); 419 EXPECT_EQ(1U, GetAndResetSentEventCount());
389 SendMouseWheelEventAck(INPUT_EVENT_ACK_STATE_NOT_CONSUMED); 420 SendMouseWheelEventAck(INPUT_EVENT_ACK_STATE_NOT_CONSUMED);
390 EXPECT_EQ(2U, all_sent_events().size()); 421 if (scroll_latching_enabled_) {
391 EXPECT_SYNTHETIC_INERTIAL_GESTURE_SCROLL_BEGIN(sent_gesture_event(0)); 422 EXPECT_EQ(1U, all_sent_events().size());
392 EXPECT_INERTIAL_GESTURE_SCROLL_END(sent_gesture_event(1)); 423 EXPECT_INERTIAL_GESTURE_SCROLL_END(sent_gesture_event(0));
393 EXPECT_EQ(2U, GetAndResetSentEventCount()); 424 EXPECT_EQ(1U, GetAndResetSentEventCount());
425 } else {
426 EXPECT_EQ(2U, all_sent_events().size());
427 EXPECT_SYNTHETIC_INERTIAL_GESTURE_SCROLL_BEGIN(sent_gesture_event(0));
428 EXPECT_INERTIAL_GESTURE_SCROLL_END(sent_gesture_event(1));
429 EXPECT_EQ(2U, GetAndResetSentEventCount());
430 }
394 } 431 }
395 432
396 std::unique_ptr<MouseWheelEventQueue> queue_; 433 std::unique_ptr<MouseWheelEventQueue> queue_;
397 std::vector<std::unique_ptr<WebInputEvent>> sent_events_; 434 std::vector<std::unique_ptr<WebInputEvent>> sent_events_;
398 size_t acked_event_count_; 435 size_t acked_event_count_;
399 InputEventAckState last_acked_event_state_; 436 InputEventAckState last_acked_event_state_;
400 base::MessageLoopForUI message_loop_; 437 base::MessageLoopForUI message_loop_;
401 WebMouseWheelEvent last_acked_event_; 438 WebMouseWheelEvent last_acked_event_;
402 int64_t scroll_end_timeout_ms_; 439 int64_t scroll_end_timeout_ms_;
403 bool scroll_latching_enabled_; 440 bool scroll_latching_enabled_;
(...skipping 218 matching lines...) Expand 10 before | Expand all | Expand 10 after
622 EXPECT_EQ(1U, sent_gesture_event(updateEventIndex)->data.scrollUpdate.deltaY); 659 EXPECT_EQ(1U, sent_gesture_event(updateEventIndex)->data.scrollUpdate.deltaY);
623 EXPECT_EQ(static_cast<size_t>(updateEventIndex + 1), 660 EXPECT_EQ(static_cast<size_t>(updateEventIndex + 1),
624 GetAndResetSentEventCount()); 661 GetAndResetSentEventCount());
625 } 662 }
626 663
627 INSTANTIATE_TEST_CASE_P(MouseWheelEventQueueTests, 664 INSTANTIATE_TEST_CASE_P(MouseWheelEventQueueTests,
628 MouseWheelEventQueueTest, 665 MouseWheelEventQueueTest,
629 testing::Bool()); 666 testing::Bool());
630 667
631 } // namespace content 668 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/renderer_host/input/mouse_wheel_event_queue.cc ('k') | ui/events/blink/input_handler_proxy.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698