Move suspend logic into OnMemoryStateChange()

content/renderer/render_thread_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/render_thread_impl.h"
 
 #include <algorithm>
 #include <limits>
 #include <map>
 #include <utility>
@@ skipping 1740 matching lines @@
 
   if (backgrounded) {
     renderer_scheduler_->OnRendererBackgrounded();
   } else {
     renderer_scheduler_->OnRendererForegrounded();
     // TODO(tasak): after enabling MemoryCoordinator, remove this Notify
     // and follow MemoryCoordinator's request.
     if (base::FeatureList::IsEnabled(features::kPurgeAndSuspend))
       base::MemoryCoordinatorClientRegistry::GetInstance()->Notify(
           base::MemoryState::NORMAL);
-
-    record_purge_suspend_metric_closure_.Cancel();
-    record_purge_suspend_metric_closure_.Reset(
-        base::Bind(&RenderThreadImpl::RecordPurgeAndSuspendMetrics,
-                   base::Unretained(this)));
-    is_renderer_suspended_ = false;
   }
 }
 
 void RenderThreadImpl::OnProcessPurgeAndSuspend() {
   ChildThreadImpl::OnProcessPurgeAndSuspend();
   DCHECK(!is_renderer_suspended_);
   if (!RendererIsHidden())
     return;
   is_renderer_suspended_ = true;
   if (base::FeatureList::IsEnabled(features::kPurgeAndSuspend)) {
     // TODO(tasak): After enabling MemoryCoordinator, remove this Notify
     // and follow MemoryCoordinator's request.
     base::MemoryCoordinatorClientRegistry::GetInstance()->Notify(
         base::MemoryState::SUSPENDED);
-    renderer_scheduler_->SuspendRenderer();
   }

[bashi, 2016/11/24 07:46:54]

ah, Maybe I should add else clause and PostDelayedTask() here?

[bashi, 2016/11/24 08:18:50]

Chatted offline. We shouldn't record metrics when OnMemoryStateChange() is
called by memory coordinator (otherwise, we mix metrics for different
experiments). Reverted UMA recording move.

-
-  // Since purging is not a synchronous task (e.g. v8 GC, oilpan GC, ...),
-  // we need to wait until the task is finished. So wait 15 seconds and
-  // update purge+suspend UMA histogram.
-  // TODO(tasak): use MemoryCoordinator's callback to report purge+suspend
-  // UMA when MemoryCoordinator is available.
-  GetRendererScheduler()->DefaultTaskRunner()->PostDelayedTask(
-      FROM_HERE, record_purge_suspend_metric_closure_.callback(),
-      base::TimeDelta::FromSeconds(15));
 }
 
 // TODO(tasak): Replace the following GetMallocUsage() with memory-infra
 // when it is possible to run memory-infra without tracing.
 #if defined(OS_WIN)
 namespace {
 
 static size_t GetMallocUsage() {
   DWORD number_of_heaps = ::GetProcessHeaps(0, NULL);
   if (number_of_heaps <= 0)
@@ skipping 475 matching lines @@
 void RenderThreadImpl::OnMemoryStateChange(base::MemoryState state) {
   // TODO(hajimehoshi): Adjust the size of this memory usage according to
   // |state|. RenderThreadImpl doesn't have a feature to limit memory usage at
   // present.
   if (blink_platform_impl_) {
     blink::WebMemoryCoordinator::onMemoryStateChange(
         static_cast<blink::MemoryState>(state));
   }
   switch (state) {
     case base::MemoryState::NORMAL:
+      record_purge_suspend_metric_closure_.Cancel();
+      record_purge_suspend_metric_closure_.Reset(
+          base::Bind(&RenderThreadImpl::RecordPurgeAndSuspendMetrics,
+                     base::Unretained(this)));
+      is_renderer_suspended_ = false;
       break;
     case base::MemoryState::THROTTLED:
       ReleaseFreeMemory();
       break;
     case base::MemoryState::SUSPENDED:
-      OnTrimMemoryImmediately();
-      ReleaseFreeMemory();
-      ClearMemory();
+      SuspendRenderer();
       break;
     case base::MemoryState::UNKNOWN:
       NOTREACHED();
       break;
   }
 }
 
+void RenderThreadImpl::SuspendRenderer() {
+  OnTrimMemoryImmediately();
+  ReleaseFreeMemory();
+  ClearMemory();
+  renderer_scheduler_->SuspendRenderer();
+  // Since purging is not a synchronous task (e.g. v8 GC, oilpan GC, ...),
+  // we need to wait until the task is finished. So wait 15 seconds and
+  // update purge+suspend UMA histogram.
+  // TODO(tasak): use MemoryCoordinator's callback to report purge+suspend
+  // UMA when MemoryCoordinator is available.
+  GetRendererScheduler()->DefaultTaskRunner()->PostDelayedTask(
+      FROM_HERE, record_purge_suspend_metric_closure_.callback(),
+      base::TimeDelta::FromSeconds(15));
+}
+
 void RenderThreadImpl::ClearMemory() {
   // Do not call into blink if it is not initialized.
   if (blink_platform_impl_) {
     // Purge Skia font cache, by setting it to 0 and then again to the
     // previous limit.
     size_t font_cache_limit = SkGraphics::SetFontCacheLimit(0);
     SkGraphics::SetFontCacheLimit(font_cache_limit);
   }
 }
 
@@ skipping 177 matching lines @@
   }
 }
 
 void RenderThreadImpl::OnRendererInterfaceRequest(
     mojom::RendererAssociatedRequest request) {
   DCHECK(!renderer_binding_.is_bound());
   renderer_binding_.Bind(std::move(request));
 }
 
 }  // namespace content