From fb246af3f30a1775ffbcf4bdcf6bb347cd5382d1 Mon Sep 17 00:00:00 2001 From: "ccameron@chromium.org" Date: Sat, 18 Aug 2012 03:11:41 +0000 Subject: Add GPU memory tab to the task manager. Each renderer process will have all of the resources that the GPU process has allocated on its behalf (including WebGL resources, compositor resources, and the backbuffer) included in its printed total. The GPU process will have the all resources currently allocated by the GPU process in its column. This will be approximately the sum of all other rows. The row for the GPU process is printed in ()s to draw attention to the fact that its size includes duplicates from other processes' sizes. I happy this UI scheme (having played with a few), but I'd wider feedback. Note that we do not account for swapchains or for backbuffers allocated by the browser process, so those allocations are not counted in the total. BUG=140157 Review URL: https://chromiumcodereview.appspot.com/10854076 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152233 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/resources/task_manager/defines.js | 1 + chrome/browser/resources/task_manager/main.js | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'chrome/browser/resources') diff --git a/chrome/browser/resources/task_manager/defines.js b/chrome/browser/resources/task_manager/defines.js index e66791e..51141fb 100644 --- a/chrome/browser/resources/task_manager/defines.js +++ b/chrome/browser/resources/task_manager/defines.js @@ -30,6 +30,7 @@ var DEFAULT_COLUMNS = [ ['webCoreScriptsCacheSize', 'webcoreScriptsCacheColumn', 120, false], ['webCoreCSSCacheSize', 'webcoreCSSCacheColumn', 120, false], ['fps', 'fpsColumn', 50, true], + ['videoMemory', 'videoMemoryColumn', 80, false], ['sqliteMemoryUsed', 'sqliteMemoryUsedColumn', 80, false], ['goatsTeleported', 'goatsTeleportedColumn', 80, false], ['v8MemoryAllocatedSize', 'javascriptMemoryAllocatedColumn', 120, false], diff --git a/chrome/browser/resources/task_manager/main.js b/chrome/browser/resources/task_manager/main.js index 3c0ae98..436089d 100644 --- a/chrome/browser/resources/task_manager/main.js +++ b/chrome/browser/resources/task_manager/main.js @@ -115,8 +115,8 @@ TaskManager.prototype = { var COLUMNS_SORTED_BY_VALUE = [ 'cpuUsage', 'physicalMemory', 'sharedMemory', 'privateMemory', 'networkUsage', 'webCoreImageCacheSize', 'webCoreScriptsCacheSize', - 'webCoreCSSCacheSize', 'fps', 'sqliteMemoryUsed', 'goatsTeleported', - 'v8MemoryAllocatedSize']; + 'webCoreCSSCacheSize', 'fps', 'videoMemory', 'sqliteMemoryUsed', + 'goatsTeleported', 'v8MemoryAllocatedSize']; for (var i = 0; i < DEFAULT_COLUMNS.length; i++) { var columnId = DEFAULT_COLUMNS[i][0]; -- cgit v1.1