Revert 134527 - Revert 134480 - Revert 134428 - GpuMemoryManager suggests values for renderer Contents Texture Managers' preferred memory limit.

========================================
This broke mac browser tests with "Failed to initialize command buffer service."
broken tests:AudioLayoutTest.AudioOnlyVideoIntrinsicSize and AudioLayoutTest.MediaDocumentAudioSize

BUG=123382
TEST=Manual


Review URL: http://codereview.chromium.org/10083056

TBR=mmocny@chromium.org
========================================

This CL was not likely to be the cause and I just ran mac browser_tests without any issues.
Review URL: https://chromiumcodereview.appspot.com/10267002

TBR=nsylvain@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10274007

TBR=mmocny@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10270014

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

1 files changed, 5 insertions, 11 deletions

diff --git a/content/common/gpu/gpu_memory_allocation.h b/content/common/gpu/gpu_memory_allocation.h
index 3e11979..b38fe832 100644
--- a/content/common/gpu/gpu_memory_allocation.h
+++ b/content/common/gpu/gpu_memory_allocation.h
@@ -12,6 +12,7 @@
 // and assigned to the browser and renderer context.
 // They will change over time, given memory availability, and browser state.
 
+
 // Memory Allocation which will be assigned to the renderer context.
 struct GpuMemoryAllocationForRenderer {
   enum {
@@ -67,24 +68,17 @@ struct GpuMemoryAllocationForBrowser {
 // GpuMemoryManager.
 struct GpuMemoryAllocation : public GpuMemoryAllocationForRenderer,
                              public GpuMemoryAllocationForBrowser {
-  // Bitmap
-  enum BufferAllocation {
-    kHasNoBuffers = 0,
-    kHasFrontbuffer = 1,
-    kHasBackbuffer = 2
-  };
-
   GpuMemoryAllocation()
       : GpuMemoryAllocationForRenderer(),
         GpuMemoryAllocationForBrowser() {
   }
 
   GpuMemoryAllocation(size_t gpu_resource_size_in_bytes,
-                      int allocationBitmap)
+                      bool suggest_have_backbuffer,
+                      bool suggest_have_frontbuffer)
       : GpuMemoryAllocationForRenderer(gpu_resource_size_in_bytes,
-            (allocationBitmap & kHasBackbuffer) == kHasBackbuffer),
-        GpuMemoryAllocationForBrowser(
-            (allocationBitmap & kHasFrontbuffer) == kHasFrontbuffer) {
+                                       suggest_have_backbuffer),
+        GpuMemoryAllocationForBrowser(suggest_have_frontbuffer) {
   }
 
   bool operator==(const GpuMemoryAllocation& other) const {