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

Side by Side Diff: content/browser/renderer_host/render_widget_host_unittest.cc

Issue 217163006: Defer synthetic gesture completions until events have been flushed (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Restore browser test Created 6 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 unified diff | Download patch
« no previous file with comments | « content/browser/renderer_host/render_widget_host_impl.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/bind.h" 6 #include "base/bind.h"
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "base/memory/shared_memory.h" 9 #include "base/memory/shared_memory.h"
10 #include "base/timer/timer.h" 10 #include "base/timer/timer.h"
(...skipping 200 matching lines...) Expand 10 before | Expand all | Expand 10 after
211 211
212 bool unresponsive_timer_fired() const { 212 bool unresponsive_timer_fired() const {
213 return unresponsive_timer_fired_; 213 return unresponsive_timer_fired_;
214 } 214 }
215 215
216 void set_hung_renderer_delay_ms(int delay_ms) { 216 void set_hung_renderer_delay_ms(int delay_ms) {
217 hung_renderer_delay_ms_ = delay_ms; 217 hung_renderer_delay_ms_ = delay_ms;
218 } 218 }
219 219
220 unsigned GestureEventLastQueueEventSize() const { 220 unsigned GestureEventLastQueueEventSize() const {
221 return gesture_event_queue()->coalesced_gesture_events_.size(); 221 return gesture_event_queue().coalesced_gesture_events_.size();
222 } 222 }
223 223
224 WebGestureEvent GestureEventSecondFromLastQueueEvent() const { 224 WebGestureEvent GestureEventSecondFromLastQueueEvent() const {
225 return gesture_event_queue()->coalesced_gesture_events_.at( 225 return gesture_event_queue().coalesced_gesture_events_.at(
226 GestureEventLastQueueEventSize() - 2).event; 226 GestureEventLastQueueEventSize() - 2).event;
227 } 227 }
228 228
229 WebGestureEvent GestureEventLastQueueEvent() const { 229 WebGestureEvent GestureEventLastQueueEvent() const {
230 return gesture_event_queue()->coalesced_gesture_events_.back().event; 230 return gesture_event_queue().coalesced_gesture_events_.back().event;
231 } 231 }
232 232
233 unsigned GestureEventDebouncingQueueSize() const { 233 unsigned GestureEventDebouncingQueueSize() const {
234 return gesture_event_queue()->debouncing_deferral_queue_.size(); 234 return gesture_event_queue().debouncing_deferral_queue_.size();
235 } 235 }
236 236
237 WebGestureEvent GestureEventQueueEventAt(int i) const { 237 WebGestureEvent GestureEventQueueEventAt(int i) const {
238 return gesture_event_queue()->coalesced_gesture_events_.at(i).event; 238 return gesture_event_queue().coalesced_gesture_events_.at(i).event;
239 } 239 }
240 240
241 bool ScrollingInProgress() const { 241 bool ScrollingInProgress() const {
242 return gesture_event_queue()->scrolling_in_progress_; 242 return gesture_event_queue().scrolling_in_progress_;
243 }
244
245 bool FlingInProgress() const {
246 return gesture_event_queue()->fling_in_progress_;
247 }
248
249 bool WillIgnoreNextACK() const {
250 return gesture_event_queue()->ignore_next_ack_;
251 } 243 }
252 244
253 void SetupForOverscrollControllerTest() { 245 void SetupForOverscrollControllerTest() {
254 SetOverscrollControllerEnabled(true); 246 SetOverscrollControllerEnabled(true);
255 overscroll_delegate_.reset(new TestOverscrollDelegate(GetView())); 247 overscroll_delegate_.reset(new TestOverscrollDelegate(GetView()));
256 overscroll_controller_->set_delegate(overscroll_delegate_.get()); 248 overscroll_controller_->set_delegate(overscroll_delegate_.get());
257 } 249 }
258 250
259 void DisableGestureDebounce() { 251 void DisableGestureDebounce() {
260 gesture_event_queue()->set_debounce_enabled_for_testing(false); 252 gesture_event_queue().set_debounce_enabled_for_testing(false);
261 } 253 }
262 254
263 void set_debounce_interval_time_ms(int delay_ms) { 255 void set_debounce_interval_time_ms(int delay_ms) {
264 gesture_event_queue()-> 256 gesture_event_queue().
265 set_debounce_interval_time_ms_for_testing(delay_ms); 257 set_debounce_interval_time_ms_for_testing(delay_ms);
266 } 258 }
267 259
268 bool TouchEventQueueEmpty() const { 260 bool TouchEventQueueEmpty() const {
269 return touch_event_queue()->empty(); 261 return touch_event_queue().empty();
270 } 262 }
271 263
272 bool ScrollStateIsContentScrolling() const { 264 bool ScrollStateIsContentScrolling() const {
273 return scroll_state() == OverscrollController::STATE_CONTENT_SCROLLING; 265 return scroll_state() == OverscrollController::STATE_CONTENT_SCROLLING;
274 } 266 }
275 267
276 bool ScrollStateIsOverscrolling() const { 268 bool ScrollStateIsOverscrolling() const {
277 return scroll_state() == OverscrollController::STATE_OVERSCROLLING; 269 return scroll_state() == OverscrollController::STATE_OVERSCROLLING;
278 } 270 }
279 271
(...skipping 28 matching lines...) Expand all
308 300
309 MockInputRouter* mock_input_router() { 301 MockInputRouter* mock_input_router() {
310 return mock_input_router_; 302 return mock_input_router_;
311 } 303 }
312 304
313 protected: 305 protected:
314 virtual void NotifyRendererUnresponsive() OVERRIDE { 306 virtual void NotifyRendererUnresponsive() OVERRIDE {
315 unresponsive_timer_fired_ = true; 307 unresponsive_timer_fired_ = true;
316 } 308 }
317 309
318 const TouchEventQueue* touch_event_queue() const { 310 const TouchEventQueue& touch_event_queue() const {
319 return input_router_impl_->touch_event_queue_.get(); 311 return input_router_impl_->touch_event_queue_;
320 } 312 }
321 313
322 const GestureEventQueue* gesture_event_queue() const { 314 const GestureEventQueue& gesture_event_queue() const {
323 return input_router_impl_->gesture_event_queue_.get(); 315 return input_router_impl_->gesture_event_queue_;
324 } 316 }
325 317
326 GestureEventQueue* gesture_event_queue() { 318 GestureEventQueue& gesture_event_queue() {
327 return input_router_impl_->gesture_event_queue_.get(); 319 return input_router_impl_->gesture_event_queue_;
328 } 320 }
329 321
330 private: 322 private:
331 bool unresponsive_timer_fired_; 323 bool unresponsive_timer_fired_;
332 324
333 // |input_router_impl_| and |mock_input_router_| are owned by 325 // |input_router_impl_| and |mock_input_router_| are owned by
334 // RenderWidgetHostImpl. The handles below are provided for convenience so 326 // RenderWidgetHostImpl. The handles below are provided for convenience so
335 // that we don't have to reinterpret_cast it all the time. 327 // that we don't have to reinterpret_cast it all the time.
336 InputRouterImpl* input_router_impl_; 328 InputRouterImpl* input_router_impl_;
337 MockInputRouter* mock_input_router_; 329 MockInputRouter* mock_input_router_;
(...skipping 2280 matching lines...) Expand 10 before | Expand all | Expand 10 after
2618 2610
2619 // Tests RWHI::ForwardTouchEventWithLatencyInfo(). 2611 // Tests RWHI::ForwardTouchEventWithLatencyInfo().
2620 PressTouchPoint(0, 1); 2612 PressTouchPoint(0, 1);
2621 SendTouchEvent(); 2613 SendTouchEvent();
2622 CheckLatencyInfoComponentInMessage( 2614 CheckLatencyInfoComponentInMessage(
2623 process_, GetLatencyComponentId(), WebInputEvent::TouchStart); 2615 process_, GetLatencyComponentId(), WebInputEvent::TouchStart);
2624 SendInputEventACK(WebInputEvent::TouchStart, INPUT_EVENT_ACK_STATE_CONSUMED); 2616 SendInputEventACK(WebInputEvent::TouchStart, INPUT_EVENT_ACK_STATE_CONSUMED);
2625 } 2617 }
2626 2618
2627 } // namespace content 2619 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/renderer_host/render_widget_host_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698