Remove is_renderer_suspended_.

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 899 matching lines @@
 
 #if defined(OS_LINUX)
   ChildProcess::current()->SetIOThreadPriority(base::ThreadPriority::DISPLAY);
   ChildThreadImpl::current()->SetThreadPriority(
       categorized_worker_pool_->background_worker_thread_id(),
       base::ThreadPriority::BACKGROUND);
 #endif
 
   record_purge_suspend_metric_closure_.Reset(base::Bind(
       &RenderThreadImpl::RecordPurgeAndSuspendMetrics, base::Unretained(this)));
-  is_renderer_suspended_ = false;
 
   base::MemoryCoordinatorClientRegistry::GetInstance()->Register(this);
 
   // If this renderer doesn't run inside the browser process, enable
   // SequencedWorkerPool. Otherwise, it should already have been enabled.
   // TODO(fdoray): Remove this once the SequencedWorkerPool to TaskScheduler
   // redirection experiment concludes https://crbug.com/622400.
   if (!command_line.HasSwitch(switches::kSingleProcess))
     base::SequencedWorkerPool::EnableForProcess();
 }
@@ skipping 840 matching lines @@
     // 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);
   }
   // 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
@@ skipping 49 matching lines @@
 
 }  // namespace
 #endif
 
 // TODO(tasak): Once it is possible to use memory-infra without tracing,
 // we should collect the metrics using memory-infra.
 // TODO(tasak): We should also report a difference between the memory usages
 // before and after purging by using memory-infra.
 void RenderThreadImpl::RecordPurgeAndSuspendMetrics() const {
   // If this renderer is resumed, we should not update UMA.
-  if (!is_renderer_suspended_)
+  if (!RendererIsHidden())
     return;
 
   // TODO(tasak): Compare memory metrics between purge-enabled renderers and
   // purge-disabled renderers (A/B testing).
   blink::WebMemoryStatistics blink_stats = blink::WebMemoryStatistics::Get();
   UMA_HISTOGRAM_MEMORY_KB("PurgeAndSuspend.Memory.PartitionAllocKB",
                           blink_stats.partitionAllocTotalAllocatedBytes / 1024);
   UMA_HISTOGRAM_MEMORY_KB("PurgeAndSuspend.Memory.BlinkGCKB",
                           blink_stats.blinkGCTotalAllocatedBytes / 1024);
 #if defined(OS_LINUX) || defined(OS_ANDROID)
@@ skipping 30 matching lines @@
   UMA_HISTOGRAM_MEMORY_MB("PurgeAndSuspend.Memory.TotalAllocatedMB",
                           (blink_stats.partitionAllocTotalAllocatedBytes +
                            blink_stats.blinkGCTotalAllocatedBytes +
                            malloc_usage + v8_usage + discardable_usage) /
                               1024 / 1024);
 }
 
 void RenderThreadImpl::OnProcessResume() {
   ChildThreadImpl::OnProcessResume();
 
-  DCHECK(is_renderer_suspended_);
-  is_renderer_suspended_ = false;
+  if (!RendererIsHidden())
+    return;
   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::NORMAL);
     renderer_scheduler_->ResumeRenderer();
   }
 }
 
 scoped_refptr<gpu::GpuChannelHost> RenderThreadImpl::EstablishGpuChannelSync() {
@@ skipping 594 matching lines @@
   }
 }
 
 void RenderThreadImpl::OnRendererInterfaceRequest(
     mojom::RendererAssociatedRequest request) {
   DCHECK(!renderer_binding_.is_bound());
   renderer_binding_.Bind(std::move(request));
 }
 
 }  // namespace content