Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 <utility> | 10 #include <utility> |
| (...skipping 897 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 908 void RenderWidgetHostImpl::StartHangMonitorTimeout(base::TimeDelta delay) { | 908 void RenderWidgetHostImpl::StartHangMonitorTimeout(base::TimeDelta delay) { |
| 909 if (hang_monitor_timeout_) | 909 if (hang_monitor_timeout_) |
| 910 hang_monitor_timeout_->Start(delay); | 910 hang_monitor_timeout_->Start(delay); |
| 911 } | 911 } |
| 912 | 912 |
| 913 void RenderWidgetHostImpl::RestartHangMonitorTimeout() { | 913 void RenderWidgetHostImpl::RestartHangMonitorTimeout() { |
| 914 if (hang_monitor_timeout_) | 914 if (hang_monitor_timeout_) |
| 915 hang_monitor_timeout_->Restart(hung_renderer_delay_); | 915 hang_monitor_timeout_->Restart(hung_renderer_delay_); |
| 916 } | 916 } |
| 917 | 917 |
| 918 void RenderWidgetHostImpl::DisableHangMonitorForTest() { | |
| 919 StopHangMonitorTimeout(); | |
| 920 hang_monitor_timeout_.reset(); | |
|
Charlie Reis
2016/05/23 17:03:30
Yeah, I think this should be sufficient for this t
| |
| 921 } | |
| 922 | |
| 918 void RenderWidgetHostImpl::StopHangMonitorTimeout() { | 923 void RenderWidgetHostImpl::StopHangMonitorTimeout() { |
| 919 if (hang_monitor_timeout_) | 924 if (hang_monitor_timeout_) |
| 920 hang_monitor_timeout_->Stop(); | 925 hang_monitor_timeout_->Stop(); |
| 921 RendererIsResponsive(); | 926 RendererIsResponsive(); |
| 922 } | 927 } |
| 923 | 928 |
| 924 void RenderWidgetHostImpl::StartNewContentRenderingTimeout() { | 929 void RenderWidgetHostImpl::StartNewContentRenderingTimeout() { |
| 925 // It is possible for a compositor frame to arrive before the browser is | 930 // It is possible for a compositor frame to arrive before the browser is |
| 926 // notified about the page being committed, in which case no timer is | 931 // notified about the page being committed, in which case no timer is |
| 927 // necessary. | 932 // necessary. |
| (...skipping 1223 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2151 return delegate_ ? delegate_->GetRootBrowserAccessibilityManager() : NULL; | 2156 return delegate_ ? delegate_->GetRootBrowserAccessibilityManager() : NULL; |
| 2152 } | 2157 } |
| 2153 | 2158 |
| 2154 BrowserAccessibilityManager* | 2159 BrowserAccessibilityManager* |
| 2155 RenderWidgetHostImpl::GetOrCreateRootBrowserAccessibilityManager() { | 2160 RenderWidgetHostImpl::GetOrCreateRootBrowserAccessibilityManager() { |
| 2156 return delegate_ ? | 2161 return delegate_ ? |
| 2157 delegate_->GetOrCreateRootBrowserAccessibilityManager() : NULL; | 2162 delegate_->GetOrCreateRootBrowserAccessibilityManager() : NULL; |
| 2158 } | 2163 } |
| 2159 | 2164 |
| 2160 } // namespace content | 2165 } // namespace content |
| OLD | NEW |