| Index: content/common/gpu/gpu_memory_allocation.h
|
| diff --git a/content/common/gpu/gpu_memory_allocation.h b/content/common/gpu/gpu_memory_allocation.h
|
| index b38fe8320403a9bd8327dc659963479e7914867a..3e1197971d94408c158f8887b1c0d6291d687495 100644
|
| --- a/content/common/gpu/gpu_memory_allocation.h
|
| +++ b/content/common/gpu/gpu_memory_allocation.h
|
| @@ -12,7 +12,6 @@
|
| // 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 {
|
| @@ -68,17 +67,24 @@ 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,
|
| - bool suggest_have_backbuffer,
|
| - bool suggest_have_frontbuffer)
|
| + int allocationBitmap)
|
| : GpuMemoryAllocationForRenderer(gpu_resource_size_in_bytes,
|
| - suggest_have_backbuffer),
|
| - GpuMemoryAllocationForBrowser(suggest_have_frontbuffer) {
|
| + (allocationBitmap & kHasBackbuffer) == kHasBackbuffer),
|
| + GpuMemoryAllocationForBrowser(
|
| + (allocationBitmap & kHasFrontbuffer) == kHasFrontbuffer) {
|
| }
|
|
|
| bool operator==(const GpuMemoryAllocation& other) const {
|
|
|