cc: Disable memory management in the browser compositor.

BUG=174572


Review URL: https://chromiumcodereview.appspot.com/12224129

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@182075 0039d316-1c4b-4281-b951-d872f2087c98

cc/gl_renderer.cc

@@ -136,7 +136,8 @@ bool GLRenderer::initialize()
     if (extensions.count("GL_CHROMIUM_iosurface"))
         DCHECK(extensions.count("GL_ARB_texture_rectangle"));
 
-    m_capabilities.usingGpuMemoryManager = extensions.count("GL_CHROMIUM_gpu_memory_manager");
+    m_capabilities.usingGpuMemoryManager = extensions.count("GL_CHROMIUM_gpu_memory_manager")
+                                           && settings().useMemoryManagement;
     if (m_capabilities.usingGpuMemoryManager)
         m_context->setMemoryAllocationChangedCallbackCHROMIUM(this);
 

cc/layer_tree_settings.cc

@@ -30,6 +30,7 @@ LayerTreeSettings::LayerTreeSettings()
     , useLinearFadeScrollbarAnimator(false)
     , calculateTopControlsPosition(false)
     , useCheapnessEstimator(false)
+    , useMemoryManagement(true)
     , minimumContentsScale(0.0625f)
     , lowResContentsScaleFactor(0.125f)
     , topControlsHeight(0.f)

cc/layer_tree_settings.h

@@ -33,6 +33,7 @@ class CC_EXPORT LayerTreeSettings {
   bool useLinearFadeScrollbarAnimator;
   bool calculateTopControlsPosition;
   bool useCheapnessEstimator;
+  bool useMemoryManagement;
   float minimumContentsScale;
   float lowResContentsScaleFactor;
   float topControlsHeight;

content/browser/renderer_host/compositor_impl_android.cc

@@ -175,6 +175,7 @@ void CompositorImpl::SetVisible(bool visible) {
     settings.implSidePainting = false;
     settings.calculateTopControlsPosition = false;
     settings.topControlsHeight = 0.f;
+    settings.useMemoryManagement = false;
 
     // Do not clear the framebuffer when rendering into external GL contexts
     // like Android View System's.