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

Unified Diff: content/renderer/render_thread_impl.cc

Issue 2624063002: Stop suspending renderer and changing purge interval to 20min (Closed)
Patch Set: Fixed unit_tests failure. Created 3 years, 11 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
Index: content/renderer/render_thread_impl.cc
diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
index b397ca1c56edebe3f8d7c122278f7c2ef4e28c77..8bab389154edc5bebbbc12769bf992bc25a95ee3 100644
--- a/content/renderer/render_thread_impl.cc
+++ b/content/renderer/render_thread_impl.cc
@@ -2269,10 +2269,8 @@ void RenderThreadImpl::OnMemoryStateChange(base::MemoryState state) {
}
switch (state) {
case base::MemoryState::NORMAL:
- ResumeRenderer();
break;
case base::MemoryState::THROTTLED:
- ResumeRenderer();
// TODO(bashi): Figure out what kind of strategy is suitable on
// THROTTLED state. crbug.com/674815
#if defined(OS_ANDROID)
@@ -2284,7 +2282,9 @@ void RenderThreadImpl::OnMemoryStateChange(base::MemoryState state) {
ReleaseFreeMemory();
break;
case base::MemoryState::SUSPENDED:
- SuspendRenderer();
+ OnTrimMemoryImmediately();
+ ReleaseFreeMemory();
+ ClearMemory();
break;
case base::MemoryState::UNKNOWN:
NOTREACHED();
@@ -2292,25 +2292,6 @@ void RenderThreadImpl::OnMemoryStateChange(base::MemoryState state) {
}
}
-void RenderThreadImpl::SuspendRenderer() {
- DCHECK(IsMainThread());
- OnTrimMemoryImmediately();
- ReleaseFreeMemory();
- ClearMemory();
- // TODO(bashi): Enable the tab suspension when MemoryCoordinator is enabled.
- if (!base::FeatureList::IsEnabled(features::kMemoryCoordinator) &&
- base::FeatureList::IsEnabled(features::kPurgeAndSuspend))
- renderer_scheduler_->SuspendRenderer();
-}
-
-void RenderThreadImpl::ResumeRenderer() {
- DCHECK(IsMainThread());
- // TODO(bashi): Enable the tab suspension when MemoryCoordinator is enabled.
- if (!base::FeatureList::IsEnabled(features::kMemoryCoordinator) &&
- base::FeatureList::IsEnabled(features::kPurgeAndSuspend))
- renderer_scheduler_->ResumeRenderer();
-}
-
void RenderThreadImpl::ClearMemory() {
// Do not call into blink if it is not initialized.
if (blink_platform_impl_) {
« chrome/browser/memory/tab_manager.cc ('K') | « content/renderer/render_thread_impl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698