cc: Remove SetMemoryPolicy from OutputSurface and Display.

content/renderer/gpu/render_widget_compositor.cc

 // Copyright (c) 2013 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/gpu/render_widget_compositor.h"
 
 #include <stddef.h>
 #include <limits>
 #include <string>
 #include <utility>
@@ skipping 480 matching lines @@
 
   if (cmd.HasSwitch(cc::switches::kEnableTileCompression)) {
     settings.renderer_settings.preferred_tile_format = cc::ETC1;
   }
 
   settings.max_staging_buffer_usage_in_bytes = 32 * 1024 * 1024;  // 32MB
   // Use 1/4th of staging buffers on low-end devices.
   if (base::SysInfo::IsLowEndDevice())
     settings.max_staging_buffer_usage_in_bytes /= 4;
 
-  cc::ManagedMemoryPolicy current = settings.memory_policy_;
-  settings.memory_policy_ = GetGpuMemoryPolicy(current);
+  cc::ManagedMemoryPolicy defaults = settings.gpu_memory_policy;
+  settings.gpu_memory_policy = GetGpuMemoryPolicy(defaults);
+
+  // These limits inherited from CompositorOutputSurface without

[enne (OOO), 2016/09/09 22:46:16]

Similarly, I don't think this comment adds anything.  Why can't this just
inherit the default settings?

[danakj, 2016/09/09 22:55:43]

Oh, ya I got halfway on that, it was my intent. Inheriting now.

+  // explanation.
+  settings.software_memory_policy = cc::ManagedMemoryPolicy(
+      128 * 1024 * 1024, gpu::MemoryAllocation::CUTOFF_ALLOW_NICE_TO_HAVE,
+      base::SharedMemory::GetHandleLimit() / 3);
 
   settings.use_cached_picture_raster =
       !cmd.HasSwitch(cc::switches::kDisableCachedPictureRaster);
 
   return settings;
 }
 
 // static
 cc::ManagedMemoryPolicy RenderWidgetCompositor::GetGpuMemoryPolicy(
-    const cc::ManagedMemoryPolicy& policy) {
-  cc::ManagedMemoryPolicy actual = policy;
+    const cc::ManagedMemoryPolicy& default_policy) {
+  cc::ManagedMemoryPolicy actual = default_policy;
   actual.bytes_limit_when_visible = 0;
 
   // If the value was overridden on the command line, use the specified value.
   static bool client_hard_limit_bytes_overridden =
       base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kForceGpuMemAvailableMb);
   if (client_hard_limit_bytes_overridden) {
     if (base::StringToSizeT(
             base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
                 switches::kForceGpuMemAvailableMb),
@@ skipping 617 matching lines @@
 
   remote_proto_channel_receiver_->OnProtoReceived(std::move(deserialized));
 }
 
 void RenderWidgetCompositor::SetPaintedDeviceScaleFactor(
     float device_scale) {
   layer_tree_host_->GetLayerTree()->SetPaintedDeviceScaleFactor(device_scale);
 }
 
 }  // namespace content