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

Side by Side Diff: chrome/browser/ui/webui/task_manager/task_manager_handler.cc

Issue 10854076: Add GPU memory tab to the task manager. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Change OnVidmemUsageStats to OnVidmemUsageStatsReceived Created 8 years, 4 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 #include "chrome/browser/ui/webui/task_manager/task_manager_handler.h" 5 #include "chrome/browser/ui/webui/task_manager/task_manager_handler.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <functional> 8 #include <functional>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 tm->GetWebCoreCacheStats(i, &resource_stats); 97 tm->GetWebCoreCacheStats(i, &resource_stats);
98 return Value::CreateDoubleValue(resource_stats.cssStyleSheets.size); 98 return Value::CreateDoubleValue(resource_stats.cssStyleSheets.size);
99 } 99 }
100 if (column_name == "fps") 100 if (column_name == "fps")
101 return Value::CreateStringValue(tm->GetResourceFPS(i)); 101 return Value::CreateStringValue(tm->GetResourceFPS(i));
102 if (column_name == "fpsValue") { 102 if (column_name == "fpsValue") {
103 float fps; 103 float fps;
104 tm->GetFPS(i, &fps); 104 tm->GetFPS(i, &fps);
105 return Value::CreateDoubleValue(fps); 105 return Value::CreateDoubleValue(fps);
106 } 106 }
107 if (column_name == "vidmem")
108 return Value::CreateStringValue(tm->GetResourceVidmem(i));
109 if (column_name == "vidmemValue") {
110 size_t vidmem;
111 bool has_duplicates;
112 tm->GetVidmem(i, &vidmem, &has_duplicates);
yoshiki 2012/08/16 06:25:59 Could you handle explicitly GetVidmem() failure? I
yoshiki 2012/08/16 06:27:03 Sorry, not std::size_t, but double.
ccameron 2012/08/16 17:58:30 GetVidmem will set the value to its minimum (0) on
ccameron 2012/08/16 17:58:30 Done.
ccameron 2012/08/16 17:58:30 Done.
113 return Value::CreateDoubleValue(vidmem);
114 }
107 if (column_name == "sqliteMemoryUsed") 115 if (column_name == "sqliteMemoryUsed")
108 return Value::CreateStringValue(tm->GetResourceSqliteMemoryUsed(i)); 116 return Value::CreateStringValue(tm->GetResourceSqliteMemoryUsed(i));
109 if (column_name == "sqliteMemoryUsedValue") { 117 if (column_name == "sqliteMemoryUsedValue") {
110 size_t sqlite_memory; 118 size_t sqlite_memory;
111 tm->GetSqliteMemoryUsedBytes(i, &sqlite_memory); 119 tm->GetSqliteMemoryUsedBytes(i, &sqlite_memory);
112 return Value::CreateDoubleValue(sqlite_memory); 120 return Value::CreateDoubleValue(sqlite_memory);
113 } 121 }
114 if (column_name == "goatsTeleported") 122 if (column_name == "goatsTeleported")
115 return Value::CreateStringValue(tm->GetResourceGoatsTeleported(i)); 123 return Value::CreateStringValue(tm->GetResourceGoatsTeleported(i));
116 if (column_name == "goatsTeleportedValue") 124 if (column_name == "goatsTeleportedValue")
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 {"webCoreImageCacheSize", true, false}, 171 {"webCoreImageCacheSize", true, false},
164 {"webCoreScriptsCacheSize", true, false}, 172 {"webCoreScriptsCacheSize", true, false},
165 {"webCoreCSSCacheSize", true, false}, 173 {"webCoreCSSCacheSize", true, false},
166 {"sqliteMemoryUsed", true, false}, 174 {"sqliteMemoryUsed", true, false},
167 {"v8MemoryAllocatedSize", true, false}, 175 {"v8MemoryAllocatedSize", true, false},
168 {"icon", false, true}, 176 {"icon", false, true},
169 {"title", false, true}, 177 {"title", false, true},
170 {"profileName", false, true}, 178 {"profileName", false, true},
171 {"networkUsage", true, true}, 179 {"networkUsage", true, true},
172 {"fps", true, true}, 180 {"fps", true, true},
181 {"vidmemColumn", true, false},
yoshiki 2012/08/16 06:25:59 s/vidmemColumn/vidmem/
ccameron 2012/08/16 17:58:30 Done.
173 {"goatsTeleported", true, true}, 182 {"goatsTeleported", true, true},
174 {"canInspect", false, true}, 183 {"canInspect", false, true},
175 {"canActivate", false, true} 184 {"canActivate", false, true}
176 }; 185 };
177 186
178 DictionaryValue* CreateTaskGroupValue( 187 DictionaryValue* CreateTaskGroupValue(
179 const TaskManagerModel* tm, 188 const TaskManagerModel* tm,
180 const int group_index, 189 const int group_index,
181 const std::set<std::string>& columns) { 190 const std::set<std::string>& columns) {
182 DictionaryValue* val = new DictionaryValue(); 191 DictionaryValue* val = new DictionaryValue();
(...skipping 216 matching lines...) Expand 10 before | Expand all | Expand 10 after
399 void TaskManagerHandler::OnGroupAdded(const int group_start, 408 void TaskManagerHandler::OnGroupAdded(const int group_start,
400 const int group_length) { 409 const int group_length) {
401 } 410 }
402 411
403 void TaskManagerHandler::OnGroupRemoved(const int group_start, 412 void TaskManagerHandler::OnGroupRemoved(const int group_start,
404 const int group_length) { 413 const int group_length) {
405 } 414 }
406 415
407 void TaskManagerHandler::OnReadyPeriodicalUpdate() { 416 void TaskManagerHandler::OnReadyPeriodicalUpdate() {
408 } 417 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/gpu_internals_ui.cc ('k') | chrome/browser/ui/webui/task_manager/task_manager_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698