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

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

Issue 2482453002: Don't restart the hang renderer timeout on messages ack'd from the compositor thread. (Closed)
Patch Set: Fix mac build Created 4 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 "content/browser/renderer_host/input/input_router_impl.h" 5 #include "content/browser/renderer_host/input/input_router_impl.h"
6 6
7 #include <math.h> 7 #include <math.h>
8 8
9 #include <utility> 9 #include <utility>
10 10
(...skipping 420 matching lines...) Expand 10 before | Expand all | Expand 10 after
431 // renderer. Consequently, such event types should not affect event time 431 // renderer. Consequently, such event types should not affect event time
432 // or in-flight event count metrics. 432 // or in-flight event count metrics.
433 if (dispatch_type == InputEventDispatchType::DISPATCH_TYPE_BLOCKING) 433 if (dispatch_type == InputEventDispatchType::DISPATCH_TYPE_BLOCKING)
434 client_->IncrementInFlightEventCount(input_event.type); 434 client_->IncrementInFlightEventCount(input_event.type);
435 return true; 435 return true;
436 } 436 }
437 return false; 437 return false;
438 } 438 }
439 439
440 void InputRouterImpl::OnInputEventAck(const InputEventAck& ack) { 440 void InputRouterImpl::OnInputEventAck(const InputEventAck& ack) {
441 client_->DecrementInFlightEventCount(); 441 client_->DecrementInFlightEventCount(ack.source);
442 442
443 if (ack.overscroll) { 443 if (ack.overscroll) {
444 DCHECK(ack.type == WebInputEvent::MouseWheel || 444 DCHECK(ack.type == WebInputEvent::MouseWheel ||
445 ack.type == WebInputEvent::GestureScrollUpdate); 445 ack.type == WebInputEvent::GestureScrollUpdate);
446 OnDidOverscroll(*ack.overscroll); 446 OnDidOverscroll(*ack.overscroll);
447 } 447 }
448 448
449 ProcessInputEventAck(ack.type, ack.state, ack.latency, 449 ProcessInputEventAck(ack.type, ack.state, ack.latency,
450 ack.unique_touch_event_id, RENDERER); 450 ack.unique_touch_event_id, RENDERER);
451 } 451 }
(...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after
627 627
628 flush_requested_ = false; 628 flush_requested_ = false;
629 client_->DidFlush(); 629 client_->DidFlush();
630 } 630 }
631 631
632 void InputRouterImpl::SetFrameTreeNodeId(int frameTreeNodeId) { 632 void InputRouterImpl::SetFrameTreeNodeId(int frameTreeNodeId) {
633 frame_tree_node_id_ = frameTreeNodeId; 633 frame_tree_node_id_ = frameTreeNodeId;
634 } 634 }
635 635
636 } // namespace content 636 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698