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

Unified Diff: extensions/renderer/dispatcher.cc

Issue 256803012: extensions::Dispatcher: Don't crash if forced_idle_timer_ is null. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: extensions/renderer/dispatcher.cc
diff --git a/extensions/renderer/dispatcher.cc b/extensions/renderer/dispatcher.cc
index 36134d8788062f22c8bd44f1fccb51943bb7f76a..185d47b24064a92c63d0cb1010553f1b12dfe9c4 100644
--- a/extensions/renderer/dispatcher.cc
+++ b/extensions/renderer/dispatcher.cc
@@ -506,9 +506,10 @@ void Dispatcher::WebKitInitialized() {
}
void Dispatcher::IdleNotification() {
- if (is_extension_process_) {
+ if (is_extension_process_ && forced_idle_timer_) {
// Dampen the forced delay as well if the extension stays idle for long
- // periods of time.
+ // periods of time. (forced_idle_timer_ can be NULL after
+ // OnRenderProcessShutdown has been called.)
int64 forced_delay_ms =
std::max(RenderThread::Get()->GetIdleNotificationDelayInMs(),
kMaxExtensionIdleHandlerDelayMs);
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698