Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(949)

Unified Diff: content/common/gpu/gpu_memory_manager.cc

Issue 1244843004: Avoid double-counting in GpuChannel memory tracking. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/common/gpu/gpu_memory_manager.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/common/gpu/gpu_memory_manager.cc
diff --git a/content/common/gpu/gpu_memory_manager.cc b/content/common/gpu/gpu_memory_manager.cc
index ceedf098de50c22c877dd09b46f0f26ec71834a5..28f8b5f1cbcf25e58534f539ff50242291582b7b 100644
--- a/content/common/gpu/gpu_memory_manager.cc
+++ b/content/common/gpu/gpu_memory_manager.cc
@@ -206,10 +206,10 @@ void GpuMemoryManager::SetClientStateVisible(
ScheduleManage(visible ? kScheduleManageNow : kScheduleManageLater);
}
-uint64 GpuMemoryManager::GetClientMemoryUsage(
- const GpuMemoryManagerClient* client) const {
+uint64 GpuMemoryManager::GetTrackerMemoryUsage(
+ gpu::gles2::MemoryTracker* tracker) const {
TrackingGroupMap::const_iterator tracking_group_it =
- tracking_groups_.find(client->GetMemoryTracker());
+ tracking_groups_.find(tracker);
DCHECK(tracking_group_it != tracking_groups_.end());
return tracking_group_it->second->GetSize();
}
« no previous file with comments | « content/common/gpu/gpu_memory_manager.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698