Index: cc/gl_renderer.cc |
diff --git a/cc/gl_renderer.cc b/cc/gl_renderer.cc |
index 1b48615a12c70d9a905a4ed3b9166bb1fac04cf0..7f8d2353c0e826c44509d8f430186444bc1ddba7 100644 |
--- a/cc/gl_renderer.cc |
+++ b/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); |