cc: Remove SetMemoryPolicy from OutputSurface and Display.

cc/trees/layer_tree_settings.cc

 // 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.
 
 #include "cc/trees/layer_tree_settings.h"
 
 #include "cc/proto/gfx_conversions.h"
 #include "third_party/khronos/GLES2/gl2.h"
 
 namespace cc {
 
 LayerTreeSettings::LayerTreeSettings()
     : default_tile_size(gfx::Size(256, 256)),
       max_untiled_layer_size(gfx::Size(512, 512)),
       minimum_occlusion_tracking_size(gfx::Size(160, 160)),
-      memory_policy_(64 * 1024 * 1024,
-                     gpu::MemoryAllocation::CUTOFF_ALLOW_EVERYTHING,
-                     ManagedMemoryPolicy::kDefaultNumResourcesLimit) {}
+      gpu_memory_policy(64 * 1024 * 1024,
+                        gpu::MemoryAllocation::CUTOFF_ALLOW_EVERYTHING,
+                        ManagedMemoryPolicy::kDefaultNumResourcesLimit),
+      software_memory_policy(128 * 1024 * 1024,
+                             gpu::MemoryAllocation::CUTOFF_ALLOW_NICE_TO_HAVE,
+                             ManagedMemoryPolicy::kDefaultNumResourcesLimit) {}
 
 LayerTreeSettings::LayerTreeSettings(const LayerTreeSettings& other) = default;
 LayerTreeSettings::~LayerTreeSettings() = default;
 
 bool LayerTreeSettings::operator==(const LayerTreeSettings& other) const {
   return renderer_settings == other.renderer_settings &&
          single_thread_proxy_scheduler == other.single_thread_proxy_scheduler &&
          use_external_begin_frame_source ==
              other.use_external_begin_frame_source &&
          main_frame_before_activation_enabled ==
@@ skipping 43 matching lines @@
          scheduled_raster_task_limit == other.scheduled_raster_task_limit &&
          use_occlusion_for_tile_prioritization ==
              other.use_occlusion_for_tile_prioritization &&
          verify_clip_tree_calculations == other.verify_clip_tree_calculations &&
          verify_transform_tree_calculations ==
              other.verify_transform_tree_calculations &&
          image_decode_tasks_enabled == other.image_decode_tasks_enabled &&
          wait_for_beginframe_interval == other.wait_for_beginframe_interval &&
          max_staging_buffer_usage_in_bytes ==
              other.max_staging_buffer_usage_in_bytes &&
-         memory_policy_ == other.memory_policy_ &&
+         gpu_memory_policy == other.gpu_memory_policy &&
+         software_memory_policy == other.software_memory_policy &&
          LayerTreeDebugState::Equal(initial_debug_state,
                                     other.initial_debug_state) &&
          use_cached_picture_raster == other.use_cached_picture_raster;
 }
 
 SchedulerSettings LayerTreeSettings::ToSchedulerSettings() const {
   SchedulerSettings scheduler_settings;
   scheduler_settings.use_external_begin_frame_source =
       use_external_begin_frame_source;
   scheduler_settings.main_frame_before_activation_enabled =
       main_frame_before_activation_enabled;
   scheduler_settings.timeout_and_draw_when_animation_checkerboards =
       timeout_and_draw_when_animation_checkerboards;
   scheduler_settings.using_synchronous_renderer_compositor =
       using_synchronous_renderer_compositor;
   scheduler_settings.throttle_frame_production = wait_for_beginframe_interval;
   scheduler_settings.background_frame_interval =
       base::TimeDelta::FromSecondsD(1.0 / background_animation_rate);
   scheduler_settings.abort_commit_before_output_surface_creation =
       abort_commit_before_output_surface_creation;
   return scheduler_settings;
 }
 
 }  // namespace cc