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

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

Issue 44983003: Events ignoring ack disposition receive synthetic acks. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address jdduke's comments. Created 7 years, 1 month 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "base/basictypes.h" 5 #include "base/basictypes.h"
6 #include "base/memory/scoped_ptr.h" 6 #include "base/memory/scoped_ptr.h"
7 #include "base/strings/utf_string_conversions.h" 7 #include "base/strings/utf_string_conversions.h"
8 #include "content/browser/renderer_host/input/gesture_event_filter.h" 8 #include "content/browser/renderer_host/input/gesture_event_filter.h"
9 #include "content/browser/renderer_host/input/immediate_input_router.h" 9 #include "content/browser/renderer_host/input/immediate_input_router.h"
10 #include "content/browser/renderer_host/input/input_router_client.h" 10 #include "content/browser/renderer_host/input/input_router_client.h"
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
122 scoped_ptr<IPC::Message> response( 122 scoped_ptr<IPC::Message> response(
123 new InputHostMsg_HandleInputEvent_ACK(0, type, ack_result, 123 new InputHostMsg_HandleInputEvent_ACK(0, type, ack_result,
124 ui::LatencyInfo())); 124 ui::LatencyInfo()));
125 input_router_->OnMessageReceived(*response); 125 input_router_->OnMessageReceived(*response);
126 } 126 }
127 127
128 ImmediateInputRouter* input_router() const { 128 ImmediateInputRouter* input_router() const {
129 return static_cast<ImmediateInputRouter*>(input_router_.get()); 129 return static_cast<ImmediateInputRouter*>(input_router_.get());
130 } 130 }
131 131
132 size_t GestureEventQueueSize() {
133 return input_router()->gesture_event_filter_->
134 coalesced_gesture_events_.size();
135 }
136
132 bool no_touch_to_renderer() { 137 bool no_touch_to_renderer() {
133 return input_router()->touch_event_queue_->no_touch_to_renderer(); 138 return input_router()->touch_event_queue_->no_touch_to_renderer();
134 } 139 }
135 140
136 bool TouchEventQueueEmpty() const { 141 bool TouchEventQueueEmpty() const {
137 return input_router()->touch_event_queue_->empty(); 142 return input_router()->touch_event_queue_->empty();
138 } 143 }
139 144
140 size_t GetSentMessageCountAndResetSink() { 145 size_t GetSentMessageCountAndResetSink() {
141 size_t count = process_->sink().message_count(); 146 size_t count = process_->sink().message_count();
(...skipping 409 matching lines...) Expand 10 before | Expand all | Expand 10 after
551 556
552 // Check that the second event was sent. 557 // Check that the second event was sent.
553 EXPECT_TRUE(process_->sink().GetUniqueMessageMatching( 558 EXPECT_TRUE(process_->sink().GetUniqueMessageMatching(
554 InputMsg_HandleInputEvent::ID)); 559 InputMsg_HandleInputEvent::ID));
555 EXPECT_EQ(1U, GetSentMessageCountAndResetSink()); 560 EXPECT_EQ(1U, GetSentMessageCountAndResetSink());
556 561
557 // Check that the correct unhandled wheel event was received. 562 // Check that the correct unhandled wheel event was received.
558 EXPECT_EQ(ack_handler_->acked_wheel_event().deltaY, -5); 563 EXPECT_EQ(ack_handler_->acked_wheel_event().deltaY, -5);
559 } 564 }
560 565
566 // Test that GestureShowPress, GestureTapDown and GestureTapCancel events don't
567 // wait for ACKs.
568 TEST_F(ImmediateInputRouterTest, GestureTypesIgnoringAck) {
569 // The show press, tap down and tap cancel events will be acked immediately,
570 // since they ignore ack disposition.
571 SimulateGestureEvent(WebInputEvent::GestureShowPress,
572 WebGestureEvent::Touchscreen);
573 EXPECT_EQ(1U, GetSentMessageCountAndResetSink());
574 EXPECT_EQ(0U, GestureEventQueueSize());
jdduke (slow) 2013/11/07 23:12:52 You can just delete all the "GestureEventQueueSize
tdresser 2013/11/08 16:20:34 Done.
575 EXPECT_EQ(1U, ack_handler_->GetAndResetAckCount());
576
577 SimulateGestureEvent(WebInputEvent::GestureTapDown,
578 WebGestureEvent::Touchscreen);
579 EXPECT_EQ(1U, GetSentMessageCountAndResetSink());
580 EXPECT_EQ(0U, GestureEventQueueSize());
581 EXPECT_EQ(1U, ack_handler_->GetAndResetAckCount());
582
583 SimulateGestureEvent(WebInputEvent::GestureTapCancel,
584 WebGestureEvent::Touchscreen);
585 EXPECT_EQ(1U, GetSentMessageCountAndResetSink());
586 EXPECT_EQ(0U, GestureEventQueueSize());
587 EXPECT_EQ(1U, ack_handler_->GetAndResetAckCount());
588
589 // Interleave a few events that do and do not ignore acks, ensuring that
590 // ack-ignoring events aren't dispatched until all prior events which observe
591 // their ack disposition have been dispatched.
592 SimulateGestureEvent(WebInputEvent::GesturePinchBegin,
593 WebGestureEvent::Touchpad);
594 ASSERT_EQ(1U, GetSentMessageCountAndResetSink());
595 ASSERT_EQ(1U, GestureEventQueueSize());
596 EXPECT_EQ(0U, ack_handler_->GetAndResetAckCount());
597
598 SimulateGestureEvent(WebInputEvent::GestureTapDown,
599 WebGestureEvent::Touchscreen);
600 EXPECT_EQ(0U, GetSentMessageCountAndResetSink());
601 EXPECT_EQ(2U, GestureEventQueueSize());
602 EXPECT_EQ(0U, ack_handler_->GetAndResetAckCount());
603
604 SimulateGestureEvent(WebInputEvent::GesturePinchUpdate,
605 WebGestureEvent::Touchpad);
606 EXPECT_EQ(0U, GetSentMessageCountAndResetSink());
607 EXPECT_EQ(3U, GestureEventQueueSize());
608 EXPECT_EQ(0U, ack_handler_->GetAndResetAckCount());
609
610 SimulateGestureEvent(WebInputEvent::GestureShowPress,
611 WebGestureEvent::Touchscreen);
612 EXPECT_EQ(0U, GetSentMessageCountAndResetSink());
613 EXPECT_EQ(4U, GestureEventQueueSize());
614 EXPECT_EQ(0U, ack_handler_->GetAndResetAckCount());
615
616 SimulateGestureEvent(WebInputEvent::GesturePinchEnd,
617 WebGestureEvent::Touchpad);
618 EXPECT_EQ(0U, GetSentMessageCountAndResetSink());
619 EXPECT_EQ(5U, GestureEventQueueSize());
620 EXPECT_EQ(0U, ack_handler_->GetAndResetAckCount());
621
622 SimulateGestureEvent(WebInputEvent::GestureTapCancel,
623 WebGestureEvent::Touchscreen);
624 EXPECT_EQ(0U, GetSentMessageCountAndResetSink());
625 EXPECT_EQ(6U, GestureEventQueueSize());
626 EXPECT_EQ(0U, ack_handler_->GetAndResetAckCount());
627
628 // Now ack each event. Ack-ignoring events should not be dispatched until all
629 // prior events which observe ack disposition have been fired, at which
630 // point they should be sent immediately.
631 SendInputEventACK(WebInputEvent::GesturePinchBegin,
632 INPUT_EVENT_ACK_STATE_NOT_CONSUMED);
633 EXPECT_EQ(2U, GetSentMessageCountAndResetSink());
634 EXPECT_EQ(4U, GestureEventQueueSize());
635 EXPECT_EQ(2U, ack_handler_->GetAndResetAckCount());
636
637 // For events which ignore ack disposition, non-synthetic acks are ignored.
638 SendInputEventACK(WebInputEvent::GestureTapDown,
639 INPUT_EVENT_ACK_STATE_NOT_CONSUMED);
640 EXPECT_EQ(0U, GetSentMessageCountAndResetSink());
641 EXPECT_EQ(4U, GestureEventQueueSize());
642 EXPECT_EQ(0U, ack_handler_->GetAndResetAckCount());
643
644 SendInputEventACK(WebInputEvent::GesturePinchUpdate,
645 INPUT_EVENT_ACK_STATE_NOT_CONSUMED);
646 EXPECT_EQ(2U, GetSentMessageCountAndResetSink());
647 EXPECT_EQ(2U, GestureEventQueueSize());
648 EXPECT_EQ(2U, ack_handler_->GetAndResetAckCount());
649
650 // For events which ignore ack disposition, non-synthetic acks are ignored.
651 SendInputEventACK(WebInputEvent::GestureShowPress,
652 INPUT_EVENT_ACK_STATE_NOT_CONSUMED);
653 EXPECT_EQ(0U, GetSentMessageCountAndResetSink());
654 EXPECT_EQ(2U, GestureEventQueueSize());
655 EXPECT_EQ(0U, ack_handler_->GetAndResetAckCount());
656
657 SendInputEventACK(WebInputEvent::GesturePinchEnd,
658 INPUT_EVENT_ACK_STATE_NOT_CONSUMED);
659 EXPECT_EQ(1U, GetSentMessageCountAndResetSink());
660 EXPECT_EQ(0U, GestureEventQueueSize());
661 EXPECT_EQ(2U, ack_handler_->GetAndResetAckCount());
662
663 // For events which ignore ack disposition, non-synthetic acks are ignored.
664 SendInputEventACK(WebInputEvent::GestureTapCancel,
665 INPUT_EVENT_ACK_STATE_NOT_CONSUMED);
666 EXPECT_EQ(0U, GetSentMessageCountAndResetSink());
667 EXPECT_EQ(0U, GestureEventQueueSize());
668 EXPECT_EQ(0U, ack_handler_->GetAndResetAckCount());
669 }
670
671 // Test that GestureShowPress events don't get out of order due to
672 // ignoring their acks.
673 TEST_F(ImmediateInputRouterTest, GestureShowPressIsInOrder) {
674 SimulateGestureEvent(WebInputEvent::GestureTap,
675 WebGestureEvent::Touchscreen);
676
677 EXPECT_EQ(1U, GetSentMessageCountAndResetSink());
678 EXPECT_EQ(1U, GestureEventQueueSize());
679 EXPECT_EQ(0U, ack_handler_->GetAndResetAckCount());
680
681 SimulateGestureEvent(WebInputEvent::GestureShowPress,
682 WebGestureEvent::Touchscreen);
683
684 EXPECT_EQ(0U, GetSentMessageCountAndResetSink());
685 // The ShowPress, though it ignores ack, is still stuck in the queue
686 // behind the Tap which requires an ack.
687 EXPECT_EQ(2U, GestureEventQueueSize());
688 EXPECT_EQ(0U, ack_handler_->GetAndResetAckCount());
689
690 SimulateGestureEvent(WebInputEvent::GestureShowPress,
691 WebGestureEvent::Touchscreen);
692
693 EXPECT_EQ(0U, GetSentMessageCountAndResetSink());
694 // ShowPress has entered the queue.
695 EXPECT_EQ(3U, GestureEventQueueSize());
696 EXPECT_EQ(0U, ack_handler_->GetAndResetAckCount());
697
698 SendInputEventACK(WebInputEvent::GestureTap,
699 INPUT_EVENT_ACK_STATE_NOT_CONSUMED);
700
701 // Now that the Tap has been ACKed, the ShowPress events should receive
702 // synthetics acks, and fire immediately.
703 EXPECT_EQ(2U, GetSentMessageCountAndResetSink());
704 EXPECT_EQ(0U, GestureEventQueueSize());
705 EXPECT_EQ(3U, ack_handler_->GetAndResetAckCount());
706 }
707
561 } // namespace content 708 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698