| OLD | NEW | 
|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be | 
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. | 
| 4 | 4 | 
| 5 #ifndef CONTENT_COMMON_GPU_GPU_MEMORY_MANAGER_H_ | 5 #ifndef CONTENT_COMMON_GPU_GPU_MEMORY_MANAGER_H_ | 
| 6 #define CONTENT_COMMON_GPU_GPU_MEMORY_MANAGER_H_ | 6 #define CONTENT_COMMON_GPU_GPU_MEMORY_MANAGER_H_ | 
| 7 | 7 | 
| 8 #include <list> | 8 #include <list> | 
| 9 #include <map> | 9 #include <map> | 
| 10 | 10 | 
| (...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 141         bytes_allocated_unmanaged_current_; | 141         bytes_allocated_unmanaged_current_; | 
| 142   } | 142   } | 
| 143 | 143 | 
| 144   // GpuMemoryTrackingGroup interface | 144   // GpuMemoryTrackingGroup interface | 
| 145   void TrackMemoryAllocatedChange( | 145   void TrackMemoryAllocatedChange( | 
| 146       GpuMemoryTrackingGroup* tracking_group, | 146       GpuMemoryTrackingGroup* tracking_group, | 
| 147       size_t old_size, | 147       size_t old_size, | 
| 148       size_t new_size, | 148       size_t new_size, | 
| 149       gpu::gles2::MemoryTracker::Pool tracking_pool); | 149       gpu::gles2::MemoryTracker::Pool tracking_pool); | 
| 150   void OnDestroyTrackingGroup(GpuMemoryTrackingGroup* tracking_group); | 150   void OnDestroyTrackingGroup(GpuMemoryTrackingGroup* tracking_group); | 
|  | 151   bool EnsureGPUMemoryAvailable(size_t size_needed); | 
| 151 | 152 | 
| 152   // GpuMemoryManagerClientState interface | 153   // GpuMemoryManagerClientState interface | 
| 153   void SetClientStateVisible( | 154   void SetClientStateVisible( | 
| 154       GpuMemoryManagerClientState* client_state, bool visible); | 155       GpuMemoryManagerClientState* client_state, bool visible); | 
| 155   void SetClientStateManagedMemoryStats( | 156   void SetClientStateManagedMemoryStats( | 
| 156       GpuMemoryManagerClientState* client_state, | 157       GpuMemoryManagerClientState* client_state, | 
| 157       const GpuManagedMemoryStats& stats); | 158       const GpuManagedMemoryStats& stats); | 
| 158   void OnDestroyClientState(GpuMemoryManagerClientState* client); | 159   void OnDestroyClientState(GpuMemoryManagerClientState* client); | 
| 159 | 160 | 
| 160   // Add or remove a client from its clients list (visible, nonvisible, or | 161   // Add or remove a client from its clients list (visible, nonvisible, or | 
| (...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 240 | 241 | 
| 241   // Used to disable automatic changes to Manage() in testing. | 242   // Used to disable automatic changes to Manage() in testing. | 
| 242   bool disable_schedule_manage_; | 243   bool disable_schedule_manage_; | 
| 243 | 244 | 
| 244   DISALLOW_COPY_AND_ASSIGN(GpuMemoryManager); | 245   DISALLOW_COPY_AND_ASSIGN(GpuMemoryManager); | 
| 245 }; | 246 }; | 
| 246 | 247 | 
| 247 }  // namespace content | 248 }  // namespace content | 
| 248 | 249 | 
| 249 #endif // CONTENT_COMMON_GPU_GPU_MEMORY_MANAGER_H_ | 250 #endif // CONTENT_COMMON_GPU_GPU_MEMORY_MANAGER_H_ | 
| OLD | NEW | 
|---|