Make it possible to sort the WebCore Cache size columns in the Task Manager. Also only show cache sizes once per process since the WebCore Cahce is a singleton within the renderer process.

BUG=16221
TEST=none
Review URL: http://codereview.chromium.org/244041

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

1 files changed, 3 insertions, 26 deletions

diff --git a/chrome/browser/task_manager_resource_providers.cc b/chrome/browser/task_manager_resource_providers.cc
index 8899463..20ef4d1a 100644
--- a/chrome/browser/task_manager_resource_providers.cc
+++ b/chrome/browser/task_manager_resource_providers.cc
@@ -85,36 +85,13 @@ std::wstring TaskManagerTabContentsResource::GetTitle() const {
   return l10n_util::GetStringF(IDS_TASK_MANAGER_TAB_PREFIX, tab_title);
 }
 
-std::wstring FormatStatsSize(const WebKit::WebCache::ResourceTypeStat& stat) {
-  std::wstring size = FormatBytes(stat.size, DATA_UNITS_KILOBYTE, false);
-  std::wstring live_size = FormatBytes(stat.liveSize,
-                                       DATA_UNITS_KILOBYTE,
-                                       false);
-  return l10n_util::GetStringF(IDS_TASK_MANAGER_CACHE_SIZE_CELL_TEXT,
-                               size,
-                               live_size);
-}
-
-void TaskManagerTabContentsResource::UpdateResourceStats() {
+WebKit::WebCache::ResourceTypeStats
+    TaskManagerTabContentsResource::GetWebCoreCacheStats() const {
   if (!pending_stats_update_) {
     tab_contents_->render_view_host()->Send(new ViewMsg_GetCacheResourceStats);
     pending_stats_update_ = true;
   }
-}
-
-std::wstring TaskManagerTabContentsResource::GetWebCoreImageCacheSize() {
-  UpdateResourceStats();
-  return FormatStatsSize(stats_.images);
-}
-
-std::wstring TaskManagerTabContentsResource::GetWebCoreScriptsCacheSize() {
-  UpdateResourceStats();
-  return FormatStatsSize(stats_.scripts);
-}
-
-std::wstring TaskManagerTabContentsResource::GetWebCoreCSSCacheSize() {
-  UpdateResourceStats();
-  return FormatStatsSize(stats_.cssStyleSheets);
+  return stats_;
 }
 
 void TaskManagerTabContentsResource::NotifyResourceTypeStats(