[WeakMemoryCache] Remove dead/live distinction of Resource outside core/fetch

components/web_cache/browser/web_cache_manager.h

 // Copyright (c) 2011 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.
 
 // This is the browser side of the cache manager, it tracks the activity of the
 // render processes and allocates available memory cache resources.
 
 #ifndef COMPONENTS_WEB_CACHE_BROWSER_WEB_CACHE_MANAGER_H_
 #define COMPONENTS_WEB_CACHE_BROWSER_WEB_CACHE_MANAGER_H_
 
@@ skipping 66 matching lines @@
   // cache resources.
   //
   // When a renderer moves from being inactive to being active, the cache
   // manager may decide to adjust its resource allocation, but it will delay
   // the recalculation, allowing ObserveActivity to return quickly.
   void ObserveActivity(int renderer_id);
 
   // Periodically, renderers should inform the cache manager of their current
   // statistics.  The more up-to-date the cache manager's statistics, the
   // better it can allocate cache resources.
-  void ObserveStats(int renderer_id,
-                    uint64_t min_dead_capacity,
-                    uint64_t max_dead_capacity,
-                    uint64_t capacity,
-                    uint64_t live_size,
-                    uint64_t dead_size);
+  void ObserveStats(int renderer_id, uint64_t capacity, uint64_t size);
 
   // The global limit on the number of bytes in all the in-memory caches.
   uint64_t global_size_limit() const { return global_size_limit_; }
 
   // Sets the global size limit, forcing a recalculation of cache allocations.
   void SetGlobalSizeLimit(uint64_t bytes);
 
   // Clears all in-memory caches.
   void ClearCache();
 
@@ skipping 15 matching lines @@
   static uint64_t GetDefaultGlobalSizeLimit();
 
  protected:
   // The amount of idle time before we consider a tab to be "inactive"
   static const int kRendererInactiveThresholdMinutes = 5;
 
   // Keep track of some renderer information.
   struct RendererInfo {
     // The access time for this renderer.
     base::Time access;
-    uint64_t min_dead_capacity;
-    uint64_t max_dead_capacity;
     uint64_t capacity;
-    uint64_t live_size;
-    uint64_t dead_size;
+    uint64_t size;
   };
 
   typedef std::map<int, RendererInfo> StatsMap;
 
   // An allocation is the number of bytes a specific renderer should use for
   // its cache.
   typedef std::pair<int,uint64_t> Allocation;
 
   // An allocation strategy is a list of allocations specifying the resources
   // each renderer is permitted to consume for its cache.
@@ skipping 27 matching lines @@
     // Ignore cache statistics and divide resources equally among the given
     // set of caches.
     DIVIDE_EVENLY,
 
     // Allow each renderer to keep its current set of cached resources, with
     // some extra allocation to store new objects.
     KEEP_CURRENT_WITH_HEADROOM,
 
     // Allow each renderer to keep its current set of cached resources.
     KEEP_CURRENT,
-
-    // Allow each renderer to keep cache resources it believes are currently
-    // being used, with some extra allocation to store new objects.
-    KEEP_LIVE_WITH_HEADROOM,
-
-    // Allow each renderer to keep cache resources it believes are currently
-    // being used, but instruct the renderer to discard all other data.
-    KEEP_LIVE,
   };
 
   // Helper functions for devising an allocation strategy
 
   // Add up all the stats from the given set of renderers and place the result
   // in the given parameters.
   void GatherStats(const std::set<int>& renderers,
                    uint64_t* capacity,
-                   uint64_t* live_size,
-                   uint64_t* dead_size);
+                   uint64_t* size);
 
   // Get the amount of memory that would be required to implement |tactic|
   // using the specified allocation tactic.  This function defines the
   // semantics for each of the tactics.
-  static uint64_t GetSize(AllocationTactic tactic,
-                          uint64_t live_size,
-                          uint64_t dead_size);
+  static uint64_t GetSize(AllocationTactic tactic, uint64_t size);
 
   // Attempt to use the specified tactics to compute an allocation strategy
   // and place the result in |strategy|.  |active_stats| and |inactive_stats|
   // are the aggregate statistics for |active_renderers_| and
   // |inactive_renderers_|, respectively.
   //
   // Returns |true| on success and |false| on failure.  Does not modify
   // |strategy| on failure.
   bool AttemptTactic(AllocationTactic active_tactic,
-                     uint64_t active_live_size,
-                     uint64_t active_dead_size,
+                     uint64_t active_size,
                      AllocationTactic inactive_tactic,
-                     uint64_t inactive_live_size,
-                     uint64_t inactive_dead_size,
+                     uint64_t inactive_size,
                      AllocationStrategy* strategy);
 
   // For each renderer in |renderers|, computes its allocation according to
   // |tactic| and add the result to |strategy|.  Any |extra_bytes_to_allocate|
   // is divided evenly among the renderers.
   void AddToStrategy(const std::set<int>& renderers,
                      AllocationTactic tactic,
                      uint64_t extra_bytes_to_allocate,
                      AllocationStrategy* strategy);
 
@@ skipping 37 matching lines @@
   WebCacheServicesMap web_cache_services_;
 
   base::WeakPtrFactory<WebCacheManager> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(WebCacheManager);
 };
 
 }  // namespace web_cache
 
 #endif  // COMPONENTS_WEB_CACHE_BROWSER_WEB_CACHE_MANAGER_H_