Send memory management policies to the tile manager

cc/gl_renderer.cc

 // Copyright 2010 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/gl_renderer.h"
 
 #include <set>
 #include <string>
 #include <vector>
 
@@ skipping 1304 matching lines @@
 }
 
 void GLRenderer::onMemoryAllocationChanged(WebGraphicsMemoryAllocation allocation)
 {
     // Just ignore the memory manager when it says to set the limit to zero
     // bytes. This will happen when the memory manager thinks that the renderer
     // is not visible (which the renderer knows better).
     if (allocation.bytesLimitWhenVisible) {
         ManagedMemoryPolicy policy(
             allocation.bytesLimitWhenVisible,
-            priorityCutoffValue(allocation.priorityCutoffWhenVisible),
+            priorityCutoff(allocation.priorityCutoffWhenVisible),
             allocation.bytesLimitWhenNotVisible,
-            priorityCutoffValue(allocation.priorityCutoffWhenNotVisible));
+            priorityCutoff(allocation.priorityCutoffWhenNotVisible));
 
         if (allocation.enforceButDoNotKeepAsPolicy)
             m_client->enforceManagedMemoryPolicy(policy);
         else
             m_client->setManagedMemoryPolicy(policy);
     }
 
     bool oldDiscardBackbufferWhenNotVisible = m_discardBackbufferWhenNotVisible;
     m_discardBackbufferWhenNotVisible = !allocation.suggestHaveBackbuffer;
     enforceMemoryPolicy();
     if (allocation.enforceButDoNotKeepAsPolicy)
         m_discardBackbufferWhenNotVisible = oldDiscardBackbufferWhenNotVisible;
 }
 
-int GLRenderer::priorityCutoffValue(WebKit::WebGraphicsMemoryAllocation::PriorityCutoff priorityCutoff)
+ManagedMemoryPolicy::PriorityCutoff GLRenderer::priorityCutoff(WebKit::WebGraphicsMemoryAllocation::PriorityCutoff priorityCutoff)
 {
+    // This is simple a 1:1 map, the names differ only because the WebKit names should be to match the cc names.
     switch (priorityCutoff) {
     case WebKit::WebGraphicsMemoryAllocation::PriorityCutoffAllowNothing:
-        return PriorityCalculator::allowNothingCutoff();
+        return ManagedMemoryPolicy::CUTOFF_ALLOW_NOTHING;
     case WebKit::WebGraphicsMemoryAllocation::PriorityCutoffAllowVisibleOnly:
-        return PriorityCalculator::allowVisibleOnlyCutoff();
+        return ManagedMemoryPolicy::CUTOFF_ALLOW_REQUIRED_ONLY;
     case WebKit::WebGraphicsMemoryAllocation::PriorityCutoffAllowVisibleAndNearby:
-        return PriorityCalculator::allowVisibleAndNearbyCutoff();
+        return ManagedMemoryPolicy::CUTOFF_ALLOW_NICE_TO_HAVE;
     case WebKit::WebGraphicsMemoryAllocation::PriorityCutoffAllowEverything:
-        return PriorityCalculator::allowEverythingCutoff();
+        return ManagedMemoryPolicy::CUTOFF_ALLOW_EVERYTHING;
     }
     NOTREACHED();
-    return 0;
+    return ManagedMemoryPolicy::CUTOFF_ALLOW_NOTHING;
 }
 
 void GLRenderer::enforceMemoryPolicy()
 {
     if (!m_visible) {
         TRACE_EVENT0("cc", "GLRenderer::enforceMemoryPolicy dropping resources");
         releaseRenderPassTextures();
         if (m_discardBackbufferWhenNotVisible)
             discardBackbuffer();
         GLC(m_context, m_context->flush());
@@ skipping 425 matching lines @@
 
     releaseRenderPassTextures();
 }
 
 bool GLRenderer::isContextLost()
 {
     return (m_context->getGraphicsResetStatusARB() != GL_NO_ERROR);
 }
 
 }  // namespace cc