Split image decode cache limits into "working set" vs "cache" limits

cc/trees/layer_tree_settings.h

 // Copyright 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.
 
 #ifndef CC_TREES_LAYER_TREE_SETTINGS_H_
 #define CC_TREES_LAYER_TREE_SETTINGS_H_
 
 #include <stddef.h>
 
 #include <vector>
@@ skipping 72 matching lines @@
   bool verify_clip_tree_calculations = false;
 
   // TODO(khushalsagar): Enable for all client and remove this flag if possible.
   // See crbug/com/696864.
   bool image_decode_tasks_enabled = false;
 
   bool use_layer_lists = false;
   int max_staging_buffer_usage_in_bytes = 32 * 1024 * 1024;
   ManagedMemoryPolicy gpu_memory_policy;
   ManagedMemoryPolicy software_memory_policy;
-  size_t gpu_decoded_image_budget_bytes = 96 * 1024 * 1024;
-  size_t software_decoded_image_budget_bytes = 128 * 1024 * 1024;
+  size_t decoded_image_cache_budget_bytes = 128 * 1024 * 1024;
+  size_t decoded_image_working_set_budget_bytes = 128 * 1024 * 1024;
   int max_preraster_distance_in_screen_pixels = 1000;
 
   bool enable_color_correct_rasterization = false;
 
   // TODO(sunxd): remove this flag when filter demoting and aa of mask layers
   // are implemented.
   bool enable_mask_tiling = false;
 
   // If set to true, the compositor may selectively defer image decodes to the
   // Image Decode Service and raster tiles without images until the decode is
   // ready.
   bool enable_checker_imaging = false;
 
   LayerTreeDebugState initial_debug_state;
 
   // Indicates that the LayerTreeHost should defer commits unless it has a valid
   // LocalSurfaceId set.
   bool needs_valid_local_surface_id = false;
 };
 
 }  // namespace cc
 
 #endif  // CC_TREES_LAYER_TREE_SETTINGS_H_