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

Side by Side Diff: content/renderer/render_view_impl.cc

Issue 2482453002: Don't restart the hang renderer timeout on messages ack'd from the compositor thread. (Closed)
Patch Set: 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 (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 "content/renderer/render_view_impl.h" 5 #include "content/renderer/render_view_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cmath> 8 #include <cmath>
9 #include <memory> 9 #include <memory>
10 10
(...skipping 2978 matching lines...) Expand 10 before | Expand all | Expand 10 after
2989 if (!input_event || (dispatch_type != DISPATCH_TYPE_BLOCKING && 2989 if (!input_event || (dispatch_type != DISPATCH_TYPE_BLOCKING &&
2990 dispatch_type != DISPATCH_TYPE_BLOCKING_NOTIFY_MAIN)) { 2990 dispatch_type != DISPATCH_TYPE_BLOCKING_NOTIFY_MAIN)) {
2991 return; 2991 return;
2992 } 2992 }
2993 2993
2994 if (dispatch_type == DISPATCH_TYPE_BLOCKING_NOTIFY_MAIN) { 2994 if (dispatch_type == DISPATCH_TYPE_BLOCKING_NOTIFY_MAIN) {
2995 NotifyInputEventHandled(input_event->type, 2995 NotifyInputEventHandled(input_event->type,
2996 INPUT_EVENT_ACK_STATE_NOT_CONSUMED); 2996 INPUT_EVENT_ACK_STATE_NOT_CONSUMED);
2997 } 2997 }
2998 2998
2999 std::unique_ptr<InputEventAck> ack( 2999 std::unique_ptr<InputEventAck> ack(new InputEventAck(
3000 new InputEventAck(input_event->type, INPUT_EVENT_ACK_STATE_NOT_CONSUMED)); 3000 InputEventAckLocation::INPUT_EVENT_ACK_LOCATION_MAIN_THREAD,
3001 input_event->type, INPUT_EVENT_ACK_STATE_NOT_CONSUMED));
3001 OnInputEventAck(std::move(ack)); 3002 OnInputEventAck(std::move(ack));
3002 } 3003 }
3003 3004
3004 } // namespace content 3005 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698