From bdaffe496ea996461e1008be92064236c0201a4c Mon Sep 17 00:00:00 2001 From: "thakis@chromium.org" Date: Tue, 14 Sep 2010 14:02:51 +0000 Subject: Add to the task manager the v8 column on mac and the javascript column on mac and linux. BUG=None (js column was added for windows in http://codereview.chromium.org/276009 ), 27226 (v8 column) TEST=Add v8 and javascript columns using the task manager's context menu. should work on all platforms now. Review URL: http://codereview.chromium.org/3419001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59366 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/cocoa/task_manager_mac.mm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'chrome/browser/cocoa') diff --git a/chrome/browser/cocoa/task_manager_mac.mm b/chrome/browser/cocoa/task_manager_mac.mm index c977dd9..bc8d72a 100644 --- a/chrome/browser/cocoa/task_manager_mac.mm +++ b/chrome/browser/cocoa/task_manager_mac.mm @@ -49,6 +49,10 @@ const struct ColumnWidth { arraysize("2000.0K (2000.0 live)") * kCharWidth, -1 }, { IDS_TASK_MANAGER_WEBCORE_CSS_CACHE_COLUMN, arraysize("2000.0K (2000.0 live)") * kCharWidth, -1 }, + { IDS_TASK_MANAGER_SQLITE_MEMORY_USED_COLUMN, + arraysize("800 kB") * kCharWidth, -1 }, + { IDS_TASK_MANAGER_JAVASCRIPT_MEMORY_ALLOCATED_COLUMN, + arraysize("2000.0K (2000.0 live)") * kCharWidth, -1 }, { IDS_TASK_MANAGER_GOATS_TELEPORTED_COLUMN, arraysize("15 ") * kCharWidth, -1 }, }; @@ -274,6 +278,9 @@ class SortHelper { [self addColumnWithId:IDS_TASK_MANAGER_WEBCORE_SCRIPTS_CACHE_COLUMN visible:NO]; [self addColumnWithId:IDS_TASK_MANAGER_WEBCORE_CSS_CACHE_COLUMN visible:NO]; + [self addColumnWithId:IDS_TASK_MANAGER_SQLITE_MEMORY_USED_COLUMN visible:NO]; + [self addColumnWithId:IDS_TASK_MANAGER_JAVASCRIPT_MEMORY_ALLOCATED_COLUMN + visible:NO]; [self addColumnWithId:IDS_TASK_MANAGER_GOATS_TELEPORTED_COLUMN visible:NO]; } @@ -419,6 +426,18 @@ class SortHelper { return base::SysUTF16ToNSString( model_->GetResourceWebCoreCSSCacheSize(row)); + case IDS_TASK_MANAGER_SQLITE_MEMORY_USED_COLUMN: + if (!model_->IsResourceFirstInGroup(row)) + return @""; + return base::SysUTF16ToNSString( + model_->GetResourceSqliteMemoryUsed(row)); + + case IDS_TASK_MANAGER_JAVASCRIPT_MEMORY_ALLOCATED_COLUMN: + if (!model_->IsResourceFirstInGroup(row)) + return @""; + return base::SysUTF16ToNSString( + model_->GetResourceV8MemoryAllocatedSize(row)); + case IDS_TASK_MANAGER_GOATS_TELEPORTED_COLUMN: // Goats Teleported! return base::SysUTF16ToNSString(model_->GetResourceGoatsTeleported(row)); -- cgit v1.1