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

Unified Diff: chrome/browser/chromeos/power/renderer_freezer.cc

Issue 550093004: Fix crash on suspend for chrome os (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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: chrome/browser/chromeos/power/renderer_freezer.cc
diff --git a/chrome/browser/chromeos/power/renderer_freezer.cc b/chrome/browser/chromeos/power/renderer_freezer.cc
index 6116f51df273e7324c4690538cfb90c3addb8d44..7749843daab6ee61d28030a6302c0fb08cb1d68e 100644
--- a/chrome/browser/chromeos/power/renderer_freezer.cc
+++ b/chrome/browser/chromeos/power/renderer_freezer.cc
@@ -23,14 +23,21 @@ const char kThawCommand[] = "THAWED";
} // namespace
void RendererFreezer::SuspendImminent() {
+ // SuspendImminent() might end up being called multiple times before we run
+ // OnReadyToSuspend() (crbug.com/414396). In case a callback is already
+ // pending, we only store the new callback and do nothing else.
+ if (suspend_readiness_callback_.is_null()) {
+ // There is no callback pending so post the task.
+ base::MessageLoop::current()->PostTask(
+ FROM_HERE,
+ base::Bind(&RendererFreezer::OnReadyToSuspend,
+ weak_factory_.GetWeakPtr()));
+ }
+
+ // Always update the callback because only the most recent one matters.
suspend_readiness_callback_ = DBusThreadManager::Get()
->GetPowerManagerClient()
->GetSuspendReadinessCallback();
-
- base::MessageLoop::current()->PostTask(
- FROM_HERE,
- base::Bind(&RendererFreezer::OnReadyToSuspend,
- weak_factory_.GetWeakPtr()));
}
void RendererFreezer::SuspendDone(const base::TimeDelta& sleep_duration) {
@@ -56,7 +63,7 @@ void RendererFreezer::OnReadyToSuspend() {
frozen_ = true;
}
- DCHECK(!suspend_readiness_callback_.is_null());
+ CHECK(!suspend_readiness_callback_.is_null()); // crbug.com/414396
suspend_readiness_callback_.Run();
suspend_readiness_callback_.Reset();
}
« 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