WebUI TaskManager: Add columns to display.

Add support to show following columns.
- Physical Memory
- Shared Memory
- Webkit Image Cache
- Webkit Script Cache
- Webkit CSS Cache
- FPS
- SQLite Memory
- Goats Teleported
- Javascript Memory

BUG=chromium-os:13885
TEST=manually on chromium-os

Review URL: http://codereview.chromium.org/7452017

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@93353 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 78 insertions, 2 deletions

diff --git a/chrome/browser/ui/webui/task_manager_handler.cc b/chrome/browser/ui/webui/task_manager_handler.cc
index ff1c0ba..45b2e5c 100644
--- a/chrome/browser/ui/webui/task_manager_handler.cc
+++ b/chrome/browser/ui/webui/task_manager_handler.cc
@@ -33,6 +33,20 @@ static Value* CreateColumnValue(const TaskManagerModel* tm,
     tm->GetPrivateMemory(i, &private_memory);
     return Value::CreateDoubleValue(private_memory);
   }
+  if (column_name == "sharedMemory")
+    return Value::CreateStringValue(tm->GetResourceSharedMemory(i));
+  if (column_name == "sharedMemoryValue") {
+    size_t shared_memory;
+    tm->GetSharedMemory(i, &shared_memory);
+    return Value::CreateDoubleValue(shared_memory);
+  }
+  if (column_name == "physicalMemory")
+    return Value::CreateStringValue(tm->GetResourcePhysicalMemory(i));
+  if (column_name == "physicalMemoryValue") {
+    size_t physical_memory;
+    tm->GetPhysicalMemory(i, &physical_memory);
+    return Value::CreateDoubleValue(physical_memory);
+  }
   if (column_name == "icon")
     return Value::CreateStringValue(
                web_ui_util::GetImageDataUrl(tm->GetResourceIcon(i)));
@@ -42,8 +56,52 @@ static Value* CreateColumnValue(const TaskManagerModel* tm,
     return Value::CreateStringValue(tm->GetResourceNetworkUsage(i));
   if (column_name == "networkUsageValue")
     return Value::CreateDoubleValue(tm->GetNetworkUsage(i));
-  if (column_name == "networkUsage")
-    return Value::CreateStringValue(tm->GetResourceNetworkUsage(i));
+  if (column_name == "webCoreImageCacheSize")
+    return Value::CreateStringValue(tm->GetResourceWebCoreImageCacheSize(i));
+  if (column_name == "webCoreImageCacheSizeValue") {
+    WebKit::WebCache::ResourceTypeStats resource_stats;
+    tm->GetWebCoreCacheStats(i, &resource_stats);
+    return Value::CreateDoubleValue(resource_stats.images.size);
+  }
+  if (column_name == "webCoreScriptsCacheSize")
+    return Value::CreateStringValue(tm->GetResourceWebCoreScriptsCacheSize(i));
+  if (column_name == "webCoreScriptsCacheSizeValue") {
+    WebKit::WebCache::ResourceTypeStats resource_stats;
+    tm->GetWebCoreCacheStats(i, &resource_stats);
+    return Value::CreateDoubleValue(resource_stats.scripts.size);
+  }
+  if (column_name == "webCoreCSSCacheSize")
+    return Value::CreateStringValue(tm->GetResourceWebCoreCSSCacheSize(i));
+  if (column_name == "webCoreCSSCacheSizeValue") {
+    WebKit::WebCache::ResourceTypeStats resource_stats;
+    tm->GetWebCoreCacheStats(i, &resource_stats);
+    return Value::CreateDoubleValue(resource_stats.cssStyleSheets.size);
+  }
+  if (column_name == "fps")
+    return Value::CreateStringValue(tm->GetResourceFPS(i));
+  if (column_name == "fpsValue") {
+    float fps;
+    tm->GetFPS(i, &fps);
+    return Value::CreateDoubleValue(fps);
+  }
+  if (column_name == "sqliteMemoryUsed")
+    return Value::CreateStringValue(tm->GetResourceSqliteMemoryUsed(i));
+  if (column_name == "sqliteMemoryUsedValue") {
+    size_t sqlite_memory;
+    tm->GetSqliteMemoryUsedBytes(i, &sqlite_memory);
+    return Value::CreateDoubleValue(sqlite_memory);
+  }
+  if (column_name == "goatsTeleported")
+    return Value::CreateStringValue(tm->GetResourceGoatsTeleported(i));
+  if (column_name == "goatsTeleportedValue")
+    return Value::CreateIntegerValue(tm->GetGoatsTeleported(i));
+  if (column_name == "v8MemoryAllocatedSize")
+    return Value::CreateStringValue(tm->GetResourceV8MemoryAllocatedSize(i));
+  if (column_name == "v8MemoryAllocatedSizeValue") {
+    size_t v8_memory;
+    tm->GetV8Memory(i, &v8_memory);
+    return Value::CreateDoubleValue(v8_memory);
+  }
 
   NOTREACHED();
   return NULL;
@@ -86,14 +144,32 @@ static DictionaryValue* CreateTaskGroupValue(const TaskManagerModel* tm,
   CreateGroupColomnList(tm, "processIdValue", index, 1, val);
   CreateGroupColomnList(tm, "cpuUsage", index, 1, val);
   CreateGroupColomnList(tm, "cpuUsageValue", index, 1, val);
+  CreateGroupColomnList(tm, "physicalMemory", index, 1, val);
+  CreateGroupColomnList(tm, "physicalMemoryValue", index, 1, val);
+  CreateGroupColomnList(tm, "sharedMemory", index, 1, val);
+  CreateGroupColomnList(tm, "sharedMemoryValue", index, 1, val);
   CreateGroupColomnList(tm, "privateMemory", index, 1, val);
   CreateGroupColomnList(tm, "privateMemoryValue", index, 1, val);
+  CreateGroupColomnList(tm, "webCoreImageCacheSize", index, 1, val);
+  CreateGroupColomnList(tm, "webCoreImageCacheSizeValue", index, 1, val);
+  CreateGroupColomnList(tm, "webCoreScriptsCacheSize", index, 1, val);
+  CreateGroupColomnList(tm, "webCoreScriptsCacheSizeValue", index, 1, val);
+  CreateGroupColomnList(tm, "webCoreCSSCacheSize", index, 1, val);
+  CreateGroupColomnList(tm, "webCoreCSSCacheSizeValue", index, 1, val);
+  CreateGroupColomnList(tm, "sqliteMemoryUsed", index, 1, val);
+  CreateGroupColomnList(tm, "sqliteMemoryUsedValue", index, 1, val);
+  CreateGroupColomnList(tm, "v8MemoryAllocatedSize", index, 1, val);
+  CreateGroupColomnList(tm, "v8MemoryAllocatedSizeValue", index, 1, val);
 
   // Columns which have some data in each group.
   CreateGroupColomnList(tm, "icon", index, length, val);
   CreateGroupColomnList(tm, "title", index, length, val);
   CreateGroupColomnList(tm, "networkUsage", index, length, val);
   CreateGroupColomnList(tm, "networkUsageValue", index, length, val);
+  CreateGroupColomnList(tm, "fps", index, length, val);
+  CreateGroupColomnList(tm, "fpsValue", index, length, val);
+  CreateGroupColomnList(tm, "goatsTeleported", index, length, val);
+  CreateGroupColomnList(tm, "goatsTeleportedValue", index, length, val);
 
   return val;
 }