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

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: Incorporate review feedback 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 == "videoMemory")
108 return Value::CreateStringValue(tm->GetResourceVideoMemory(i));
109 if (column_name == "videoMemoryValue") {
110 size_t video_memory;
111 bool has_duplicates;
112 double value;
113 if (tm->GetVideoMemory(i, &video_memory, &has_duplicates))
114 value = static_cast<double>(video_memory);
115 else
116 value = 0;
117 return Value::CreateDoubleValue(value);
118 }
107 if (column_name == "sqliteMemoryUsed") 119 if (column_name == "sqliteMemoryUsed")
108 return Value::CreateStringValue(tm->GetResourceSqliteMemoryUsed(i)); 120 return Value::CreateStringValue(tm->GetResourceSqliteMemoryUsed(i));
109 if (column_name == "sqliteMemoryUsedValue") { 121 if (column_name == "sqliteMemoryUsedValue") {
110 size_t sqlite_memory; 122 size_t sqlite_memory;
111 tm->GetSqliteMemoryUsedBytes(i, &sqlite_memory); 123 tm->GetSqliteMemoryUsedBytes(i, &sqlite_memory);
112 return Value::CreateDoubleValue(sqlite_memory); 124 return Value::CreateDoubleValue(sqlite_memory);
113 } 125 }
114 if (column_name == "goatsTeleported") 126 if (column_name == "goatsTeleported")
115 return Value::CreateStringValue(tm->GetResourceGoatsTeleported(i)); 127 return Value::CreateStringValue(tm->GetResourceGoatsTeleported(i));
116 if (column_name == "goatsTeleportedValue") 128 if (column_name == "goatsTeleportedValue")
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 {"webCoreImageCacheSize", true, false}, 175 {"webCoreImageCacheSize", true, false},
164 {"webCoreScriptsCacheSize", true, false}, 176 {"webCoreScriptsCacheSize", true, false},
165 {"webCoreCSSCacheSize", true, false}, 177 {"webCoreCSSCacheSize", true, false},
166 {"sqliteMemoryUsed", true, false}, 178 {"sqliteMemoryUsed", true, false},
167 {"v8MemoryAllocatedSize", true, false}, 179 {"v8MemoryAllocatedSize", true, false},
168 {"icon", false, true}, 180 {"icon", false, true},
169 {"title", false, true}, 181 {"title", false, true},
170 {"profileName", false, true}, 182 {"profileName", false, true},
171 {"networkUsage", true, true}, 183 {"networkUsage", true, true},
172 {"fps", true, true}, 184 {"fps", true, true},
185 {"videoMemory", true, false},
173 {"goatsTeleported", true, true}, 186 {"goatsTeleported", true, true},
174 {"canInspect", false, true}, 187 {"canInspect", false, true},
175 {"canActivate", false, true} 188 {"canActivate", false, true}
176 }; 189 };
177 190
178 DictionaryValue* CreateTaskGroupValue( 191 DictionaryValue* CreateTaskGroupValue(
179 const TaskManagerModel* tm, 192 const TaskManagerModel* tm,
180 const int group_index, 193 const int group_index,
181 const std::set<std::string>& columns) { 194 const std::set<std::string>& columns) {
182 DictionaryValue* val = new DictionaryValue(); 195 DictionaryValue* val = new DictionaryValue();
(...skipping 216 matching lines...) Expand 10 before | Expand all | Expand 10 after
399 void TaskManagerHandler::OnGroupAdded(const int group_start, 412 void TaskManagerHandler::OnGroupAdded(const int group_start,
400 const int group_length) { 413 const int group_length) {
401 } 414 }
402 415
403 void TaskManagerHandler::OnGroupRemoved(const int group_start, 416 void TaskManagerHandler::OnGroupRemoved(const int group_start,
404 const int group_length) { 417 const int group_length) {
405 } 418 }
406 419
407 void TaskManagerHandler::OnReadyPeriodicalUpdate() { 420 void TaskManagerHandler::OnReadyPeriodicalUpdate() {
408 } 421 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698