diff options
| author | Torne (Richard Coles) <torne@google.com> | 2013-10-31 11:16:26 +0000 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2013-10-31 11:16:26 +0000 |
| commit | 1e9bf3e0803691d0a228da41fc608347b6db4340 (patch) | |
| tree | ab2e5565f71b4219b3da406e19f16fe306704ef5 /content/common/gpu/gpu_memory_manager_client.h | |
| parent | f10b58d5bc6ae3e74076fc4ccca14cbc57ef805c (diff) | |
| download | chromium_org-1e9bf3e0803691d0a228da41fc608347b6db4340.tar.gz | |
Merge from Chromium at DEPS revision 232015
This commit was generated by merge_to_master.py.
Change-Id: If86767ad396b9e2e1a4c1e9df1427daea29703ef
Diffstat (limited to 'content/common/gpu/gpu_memory_manager_client.h')
| -rw-r--r-- | content/common/gpu/gpu_memory_manager_client.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/content/common/gpu/gpu_memory_manager_client.h b/content/common/gpu/gpu_memory_manager_client.h index 1579fb8dca..453e7a1094 100644 --- a/content/common/gpu/gpu_memory_manager_client.h +++ b/content/common/gpu/gpu_memory_manager_client.h @@ -9,7 +9,7 @@ #include "base/basictypes.h" #include "content/common/content_export.h" -#include "content/common/gpu/gpu_memory_allocation.h" +#include "gpu/command_buffer/common/gpu_memory_allocation.h" #include "gpu/command_buffer/service/memory_tracking.h" #include "ui/gfx/size.h" @@ -32,7 +32,9 @@ class CONTENT_EXPORT GpuMemoryManagerClient { // Sets buffer usage depending on Memory Allocation virtual void SetMemoryAllocation( - const GpuMemoryAllocation& allocation) = 0; + const gpu::MemoryAllocation& allocation) = 0; + + virtual void SuggestHaveFrontBuffer(bool suggest_have_frontbuffer) = 0; // Returns in bytes the total amount of GPU memory for the GPU which this // context is currently rendering on. Returns false if no extension exists @@ -46,7 +48,7 @@ class CONTENT_EXPORT GpuMemoryManagerClientState { public: ~GpuMemoryManagerClientState(); void SetVisible(bool visible); - void SetManagedMemoryStats(const GpuManagedMemoryStats& stats); + void SetManagedMemoryStats(const gpu::ManagedMemoryStats& stats); private: friend class GpuMemoryManager; @@ -80,7 +82,7 @@ class CONTENT_EXPORT GpuMemoryManagerClientState { bool list_iterator_valid_; // Statistics about memory usage. - GpuManagedMemoryStats managed_memory_stats_; + gpu::ManagedMemoryStats managed_memory_stats_; bool managed_memory_stats_received_; // When managed_memory_stats_.bytes_nicetohave leaves the range |