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

Side by Side Diff: content/renderer/mus/compositor_mus_connection_unittest.cc

Issue 2576013002: Introducing WebCoalescedInputEvent and inclusion in content/common (Closed)
Patch Set: Fix a few DCHECK hits Created 3 years, 11 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/renderer/mus/compositor_mus_connection.h" 5 #include "content/renderer/mus/compositor_mus_connection.h"
6 6
7 #include <memory> 7 #include <memory>
8 8
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "base/memory/ref_counted.h" 10 #include "base/memory/ref_counted.h"
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 ~TestInputHandlerManager() override {} 75 ~TestInputHandlerManager() override {}
76 76
77 // Stops overriding the behaviour of HandleInputEvent 77 // Stops overriding the behaviour of HandleInputEvent
78 void ClearHandleInputEventOverride(); 78 void ClearHandleInputEventOverride();
79 79
80 // Overrides the behaviour of HandleInputEvent, returing |result|. 80 // Overrides the behaviour of HandleInputEvent, returing |result|.
81 void SetHandleInputEventResult(InputEventAckState result); 81 void SetHandleInputEventResult(InputEventAckState result);
82 82
83 // InputHandlerManager: 83 // InputHandlerManager:
84 void HandleInputEvent(int routing_id, 84 void HandleInputEvent(int routing_id,
85 ui::ScopedWebInputEvent input_event, 85 blink::WebScopedInputEvent input_event,
86 const ui::LatencyInfo& latency_info, 86 const ui::LatencyInfo& latency_info,
87 const InputEventAckStateCallback& callback) override; 87 const InputEventAckStateCallback& callback) override;
88 88
89 private: 89 private:
90 // If true InputHandlerManager::HandleInputEvent is not called. 90 // If true InputHandlerManager::HandleInputEvent is not called.
91 bool override_result_; 91 bool override_result_;
92 92
93 // The result to return in HandleInputEvent if |override_result_|. 93 // The result to return in HandleInputEvent if |override_result_|.
94 InputEventAckState result_; 94 InputEventAckState result_;
95 95
96 DISALLOW_COPY_AND_ASSIGN(TestInputHandlerManager); 96 DISALLOW_COPY_AND_ASSIGN(TestInputHandlerManager);
97 }; 97 };
98 98
99 void TestInputHandlerManager::ClearHandleInputEventOverride() { 99 void TestInputHandlerManager::ClearHandleInputEventOverride() {
100 override_result_ = false; 100 override_result_ = false;
101 } 101 }
102 102
103 void TestInputHandlerManager::SetHandleInputEventResult( 103 void TestInputHandlerManager::SetHandleInputEventResult(
104 InputEventAckState result) { 104 InputEventAckState result) {
105 override_result_ = true; 105 override_result_ = true;
106 result_ = result; 106 result_ = result;
107 } 107 }
108 108
109 void TestInputHandlerManager::HandleInputEvent( 109 void TestInputHandlerManager::HandleInputEvent(
110 int routing_id, 110 int routing_id,
111 ui::ScopedWebInputEvent input_event, 111 blink::WebScopedInputEvent input_event,
112 const ui::LatencyInfo& latency_info, 112 const ui::LatencyInfo& latency_info,
113 const InputEventAckStateCallback& callback) { 113 const InputEventAckStateCallback& callback) {
114 if (override_result_) { 114 if (override_result_) {
115 callback.Run(result_, std::move(input_event), latency_info, nullptr); 115 callback.Run(result_, std::move(input_event), latency_info, nullptr);
116 return; 116 return;
117 } 117 }
118 InputHandlerManager::HandleInputEvent(routing_id, std::move(input_event), 118 InputHandlerManager::HandleInputEvent(routing_id, std::move(input_event),
119 latency_info, callback); 119 latency_info, callback);
120 } 120 }
121 121
122 // Empty implementation of InputHandlerManagerClient. 122 // Empty implementation of InputHandlerManagerClient.
123 class TestInputHandlerManagerClient : public InputHandlerManagerClient { 123 class TestInputHandlerManagerClient : public InputHandlerManagerClient {
124 public: 124 public:
125 TestInputHandlerManagerClient() {} 125 TestInputHandlerManagerClient() {}
126 ~TestInputHandlerManagerClient() override{}; 126 ~TestInputHandlerManagerClient() override{};
127 127
128 // InputHandlerManagerClient: 128 // InputHandlerManagerClient:
129 void SetInputHandlerManager( 129 void SetInputHandlerManager(
130 InputHandlerManager* input_handler_manager) override {} 130 InputHandlerManager* input_handler_manager) override {}
131 void RegisterRoutingID(int routing_id) override {} 131 void RegisterRoutingID(int routing_id) override {}
132 void UnregisterRoutingID(int routing_id) override {} 132 void UnregisterRoutingID(int routing_id) override {}
133 void DidOverscroll(int routing_id, 133 void DidOverscroll(int routing_id,
134 const ui::DidOverscrollParams& params) override {} 134 const ui::DidOverscrollParams& params) override {}
135 void DidStopFlinging(int routing_id) override {} 135 void DidStopFlinging(int routing_id) override {}
136 void DispatchNonBlockingEventToMainThread( 136 void DispatchNonBlockingEventToMainThread(
137 int routing_id, 137 int routing_id,
138 ui::ScopedWebInputEvent event, 138 blink::WebScopedInputEvent event,
139 const ui::LatencyInfo& latency_info) override {} 139 const ui::LatencyInfo& latency_info) override {}
140 140
141 void NotifyInputEventHandled(int routing_id, 141 void NotifyInputEventHandled(int routing_id,
142 blink::WebInputEvent::Type type, 142 blink::WebInputEvent::Type type,
143 InputEventAckState ack_result) override {} 143 InputEventAckState ack_result) override {}
144 void ProcessRafAlignedInput(int routing_id) override {} 144 void ProcessRafAlignedInput(int routing_id) override {}
145 145
146 private: 146 private:
147 DISALLOW_COPY_AND_ASSIGN(TestInputHandlerManagerClient); 147 DISALLOW_COPY_AND_ASSIGN(TestInputHandlerManagerClient);
148 }; 148 };
(...skipping 344 matching lines...) Expand 10 before | Expand all | Expand 10 after
493 EXPECT_FALSE(ack_callback.get()); 493 EXPECT_FALSE(ack_callback.get());
494 494
495 VerifyAndRunQueues(true, true); 495 VerifyAndRunQueues(true, true);
496 496
497 // The ack callback should have been called 497 // The ack callback should have been called
498 EXPECT_TRUE(test_callback->called()); 498 EXPECT_TRUE(test_callback->called());
499 EXPECT_EQ(EventResult::HANDLED, test_callback->result()); 499 EXPECT_EQ(EventResult::HANDLED, test_callback->result());
500 } 500 }
501 501
502 } // namespace content 502 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698