Revert of base: Introduce an explicit call for reducing emulated discardable memory usage.

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 <vector>
 
 #include "base/allocator/allocator_extension.h"
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/memory/discardable_memory.h"
-#include "base/memory/discardable_memory_emulated.h"
 #include "base/memory/shared_memory.h"
 #include "base/metrics/field_trial.h"
 #include "base/metrics/histogram.h"
 #include "base/metrics/stats_table.h"
 #include "base/path_service.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_tokenizer.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_local.h"
@@ skipping 143 matching lines @@
 const int kIdleCPUUsageThresholdInPercents = 3;
 const int kMinRasterThreads = 1;
 const int kMaxRasterThreads = 64;
 
 // Maximum allocation size allowed for image scaling filters that
 // require pre-scaling. Skia will fallback to a filter that doesn't
 // require pre-scaling if the default filter would require an
 // allocation that exceeds this limit.
 const size_t kImageCacheSingleAllocationByteLimit = 64 * 1024 * 1024;
 
-const size_t kEmulatedDiscardableMemoryBytesToKeepWhenWidgetsHidden =
-    4 * 1024 * 1024;
-
 // Keep the global RenderThreadImpl in a TLS slot so it is impossible to access
 // incorrectly from the wrong thread.
 base::LazyInstance<base::ThreadLocalPointer<RenderThreadImpl> >
     lazy_tls = LAZY_INSTANCE_INITIALIZER;
 
 class RenderViewZoomer : public RenderViewVisitor {
  public:
   RenderViewZoomer(const std::string& scheme,
                    const std::string& host,
                    double zoom_level) : scheme_(scheme),
@@ skipping 336 matching lines @@
                   supported_types.end(),
                   requested_type) != supported_types.end()) {
       type = requested_type;
     } else {
       LOG(ERROR) << "Requested discardable memory type is not supported.";
     }
   }
 
   base::DiscardableMemory::SetPreferredType(type);
 
+  // Allow discardable memory implementations to register memory pressure
+  // listeners.
+  base::DiscardableMemory::RegisterMemoryPressureListeners();
+
   // AllocateGpuMemoryBuffer must be used exclusively on one thread but
   // it doesn't have to be the same thread RenderThreadImpl is created on.
   allocate_gpu_memory_buffer_thread_checker_.DetachFromThread();
 
   if (command_line.HasSwitch(switches::kNumRasterThreads)) {
     int num_raster_threads;
     std::string string_value =
         command_line.GetSwitchValueASCII(switches::kNumRasterThreads);
     if (base::StringToInt(string_value, &num_raster_threads) &&
         num_raster_threads >= kMinRasterThreads &&
@@ skipping 1051 matching lines @@
 
 void RenderThreadImpl::WidgetDestroyed() {
   widget_count_--;
 }
 
 void RenderThreadImpl::WidgetHidden() {
   DCHECK_LT(hidden_widget_count_, widget_count_);
   hidden_widget_count_++;
 
   if (widget_count_ && hidden_widget_count_ == widget_count_) {
-    // TODO(reveman): Remove this when we have a better mechanism to prevent
-    // total discardable memory used by all renderers from growing too large.
-    base::internal::DiscardableMemoryEmulated::
-        ReduceMemoryUsageUntilWithinLimit(
-            kEmulatedDiscardableMemoryBytesToKeepWhenWidgetsHidden);
-
     if (GetContentClient()->renderer()->RunIdleHandlerWhenWidgetsHidden())
       ScheduleIdleHandler(kInitialIdleHandlerDelayMs);
   }
 }
 
 void RenderThreadImpl::WidgetRestored() {
   DCHECK_GT(hidden_widget_count_, 0);
   hidden_widget_count_--;
 
   if (!GetContentClient()->renderer()->RunIdleHandlerWhenWidgetsHidden()) {
     return;
   }
 
   ScheduleIdleHandler(kLongIdleHandlerDelayMs);
 }
 
 }  // namespace content