diff options
| author | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-11 01:51:32 +0000 |
|---|---|---|
| committer | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-11 01:51:32 +0000 |
| commit | 38b48a844731cd10d69d8e99d476e3dac9e81980 (patch) | |
| tree | b73cc4ca2cae009276db4305eac119d080f0381f /chrome/browser/views | |
| parent | 5ecc992a4bf8546b21db89901f2d87e8b4ae1a94 (diff) | |
| download | chromium_src-38b48a844731cd10d69d8e99d476e3dac9e81980.zip chromium_src-38b48a844731cd10d69d8e99d476e3dac9e81980.tar.gz chromium_src-38b48a844731cd10d69d8e99d476e3dac9e81980.tar.bz2 | |
Adds a 'V8' column to task manager to track amount of memory in JavaScript heap
BUG=27226
TEST=open task manager, enable column, compare with V8 heap profiler
Review URL: http://codereview.chromium.org/377037
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31641 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views')
| -rw-r--r-- | chrome/browser/views/task_manager_view.cc | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/chrome/browser/views/task_manager_view.cc b/chrome/browser/views/task_manager_view.cc index 468562e..bcfb422 100644 --- a/chrome/browser/views/task_manager_view.cc +++ b/chrome/browser/views/task_manager_view.cc @@ -133,6 +133,11 @@ std::wstring TaskManagerTableModel::GetText(int row, int col_id) { return std::wstring(); return model_->GetResourceSqliteMemoryUsed(row); + case IDS_TASK_MANAGER_JAVASCRIPT_MEMORY_ALLOCATED_COLUMN: + if (!model_->IsResourceFirstInGroup(row)) + return std::wstring(); + return model_->GetResourceV8MemoryAllocatedSize(row); + default: return model_->GetResourceStatsValue(row, col_id); } @@ -330,6 +335,10 @@ void TaskManagerView::Init() { columns_.push_back(TableColumn(IDS_TASK_MANAGER_SQLITE_MEMORY_USED_COLUMN, TableColumn::RIGHT, -1, 0)); columns_.back().sortable = true; + columns_.push_back( + TableColumn(IDS_TASK_MANAGER_JAVASCRIPT_MEMORY_ALLOCATED_COLUMN, + TableColumn::RIGHT, -1, 0)); + columns_.back().sortable = true; tab_table_ = new views::GroupTableView(table_model_.get(), columns_, views::ICON_AND_TEXT, false, true, @@ -347,6 +356,8 @@ void TaskManagerView::Init() { false); tab_table_->SetColumnVisibility(IDS_TASK_MANAGER_SQLITE_MEMORY_USED_COLUMN, false); + tab_table_->SetColumnVisibility( + IDS_TASK_MANAGER_JAVASCRIPT_MEMORY_ALLOCATED_COLUMN, false); tab_table_->SetColumnVisibility(IDS_TASK_MANAGER_GOATS_TELEPORTED_COLUMN, false); |