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

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

Issue 2777013004: Fix DevToolsBeforeUnloadTest and BrowserCloseManagerBrowserTest. (Closed)
Patch Set: fix Created 3 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
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/browser/renderer_host/render_widget_host_impl.h" 5 #include "content/browser/renderer_host/render_widget_host_impl.h"
6 6
7 #include <math.h> 7 #include <math.h>
8 8
9 #include <set> 9 #include <set>
10 #include <tuple> 10 #include <tuple>
(...skipping 965 matching lines...) Expand 10 before | Expand all | Expand 10 after
976 hang_monitor_timeout_->Start(delay); 976 hang_monitor_timeout_->Start(delay);
977 } 977 }
978 978
979 void RenderWidgetHostImpl::RestartHangMonitorTimeoutIfNecessary() { 979 void RenderWidgetHostImpl::RestartHangMonitorTimeoutIfNecessary() {
980 if (!hang_monitor_timeout_) 980 if (!hang_monitor_timeout_)
981 return; 981 return;
982 if (in_flight_event_count_ > 0 && !is_hidden_) 982 if (in_flight_event_count_ > 0 && !is_hidden_)
983 hang_monitor_timeout_->Restart(hung_renderer_delay_); 983 hang_monitor_timeout_->Restart(hung_renderer_delay_);
984 } 984 }
985 985
986 void RenderWidgetHostImpl::DisableHangMonitorForTesting() {
987 StopHangMonitorTimeout();
988 hang_monitor_timeout_.reset();
989 }
990
991 void RenderWidgetHostImpl::StopHangMonitorTimeout() { 986 void RenderWidgetHostImpl::StopHangMonitorTimeout() {
992 if (hang_monitor_timeout_) 987 if (hang_monitor_timeout_)
993 hang_monitor_timeout_->Stop(); 988 hang_monitor_timeout_->Stop();
994 RendererIsResponsive(); 989 RendererIsResponsive();
995 } 990 }
996 991
997 void RenderWidgetHostImpl::StartNewContentRenderingTimeout( 992 void RenderWidgetHostImpl::StartNewContentRenderingTimeout(
998 uint32_t next_source_id) { 993 uint32_t next_source_id) {
999 current_content_source_id_ = next_source_id; 994 current_content_source_id_ = next_source_id;
1000 // It is possible for a compositor frame to arrive before the browser is 995 // It is possible for a compositor frame to arrive before the browser is
(...skipping 1649 matching lines...) Expand 10 before | Expand all | Expand 10 after
2650 void RenderWidgetHostImpl::RequestCompositionUpdates(bool immediate_request, 2645 void RenderWidgetHostImpl::RequestCompositionUpdates(bool immediate_request,
2651 bool monitor_updates) { 2646 bool monitor_updates) {
2652 if (!immediate_request && monitor_updates == monitoring_composition_info_) 2647 if (!immediate_request && monitor_updates == monitoring_composition_info_)
2653 return; 2648 return;
2654 monitoring_composition_info_ = monitor_updates; 2649 monitoring_composition_info_ = monitor_updates;
2655 Send(new InputMsg_RequestCompositionUpdates(routing_id_, immediate_request, 2650 Send(new InputMsg_RequestCompositionUpdates(routing_id_, immediate_request,
2656 monitor_updates)); 2651 monitor_updates));
2657 } 2652 }
2658 2653
2659 } // namespace content 2654 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/renderer_host/render_widget_host_impl.h ('k') | content/public/browser/render_frame_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698