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

Unified Diff: content/browser/memory/memory_coordinator_impl.cc

Issue 2450093006: GetCurrentMemoryState() shouldn't return SUSPENDED state in browser (Closed)
Patch Set: DCHECK for UNKNOWN Created 4 years, 2 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 | content/browser/memory/memory_coordinator_impl_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/memory/memory_coordinator_impl.cc
diff --git a/content/browser/memory/memory_coordinator_impl.cc b/content/browser/memory/memory_coordinator_impl.cc
index d5fff2e2c5bc86e47685d9e7f91c0112bdd99fe0..5fa4ea4b3b0ed221efb56ecd509975750888fd47 100644
--- a/content/browser/memory/memory_coordinator_impl.cc
+++ b/content/browser/memory/memory_coordinator_impl.cc
@@ -111,13 +111,18 @@ void MemoryCoordinatorImpl::OnChildAdded(int render_process_id) {
}
base::MemoryState MemoryCoordinatorImpl::GetCurrentMemoryState() const {
- return current_state_;
+ // SUSPENDED state may not make sense to the browser process. Use THROTTLED
+ // instead when the global state is SUSPENDED.
+ // TODO(bashi): Maybe worth considering another state for the browser.
+ return current_state_ == MemoryState::SUSPENDED ? MemoryState::THROTTLED
+ : current_state_;
}
void MemoryCoordinatorImpl::SetCurrentMemoryStateForTesting(
base::MemoryState memory_state) {
// This changes the current state temporariy for testing. The state will be
// updated later by the task posted at ScheduleUpdateState.
+ DCHECK(memory_state != MemoryState::UNKNOWN);
base::MemoryState prev_state = current_state_;
current_state_ = memory_state;
if (prev_state != current_state_) {
@@ -200,11 +205,7 @@ void MemoryCoordinatorImpl::UpdateState() {
}
void MemoryCoordinatorImpl::NotifyStateToClients() {
- // SUSPENDED state may not make sense to the browser process. Use THROTTLED
- // instead when the global state is SUSPENDED.
- // TODO(bashi): Maybe worth considering another state for the browser.
- auto state = current_state_ == MemoryState::SUSPENDED ? MemoryState::THROTTLED
- : current_state_;
+ auto state = GetCurrentMemoryState();
base::MemoryCoordinatorClientRegistry::GetInstance()->Notify(state);
}
« no previous file with comments | « no previous file | content/browser/memory/memory_coordinator_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698