diff options
| author | nduca@chromium.org <nduca@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-06 12:09:30 +0000 |
|---|---|---|
| committer | nduca@chromium.org <nduca@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-06 12:09:30 +0000 |
| commit | abbae507224468e83f39fa8a174b5ebd589f1adf (patch) | |
| tree | c0db81a521f95ad78397a3ba908d3a126a1d60a4 /cc | |
| parent | 25de3a27c42c14be6059943d9cdefbc4227dd626 (diff) | |
| download | chromium_src-abbae507224468e83f39fa8a174b5ebd589f1adf.zip chromium_src-abbae507224468e83f39fa8a174b5ebd589f1adf.tar.gz chromium_src-abbae507224468e83f39fa8a174b5ebd589f1adf.tar.bz2 | |
[cc] Show total budget in HUD
Helps tell how close to the limit you are when you're under.
R=reveman
CC=egraether,ccameron
Review URL: https://chromiumcodereview.appspot.com/12207036
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@180963 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc')
| -rw-r--r-- | cc/heads_up_display_layer_impl.cc | 14 | ||||
| -rw-r--r-- | cc/memory_history.h | 5 | ||||
| -rw-r--r-- | cc/tile_manager.cc | 2 |
3 files changed, 16 insertions, 5 deletions
diff --git a/cc/heads_up_display_layer_impl.cc b/cc/heads_up_display_layer_impl.cc index 3474f8c..6c7f4fd 100644 --- a/cc/heads_up_display_layer_impl.cc +++ b/cc/heads_up_display_layer_impl.cc @@ -410,13 +410,19 @@ int HeadsUpDisplayLayerImpl::drawMemoryDisplay(SkCanvas* canvas, MemoryHistory* double curMB = curEntry.bytes_total() / megabyte; text = base::StringPrintf( - "%6.1f MB used", + "%6.1f MB GPU memory used", (curEntry.bytes_unreleasable + curEntry.bytes_allocated) / megabyte); drawTextLeftAligned(canvas, &paint, textRun1, text); - text = base::StringPrintf( - "%6.1f MB over budget", - (curEntry.bytes_over) / megabyte); + if (curEntry.bytes_over) { + text = base::StringPrintf( + "%6.1f MB over", + (curEntry.bytes_over) / megabyte); + } else { + text = base::StringPrintf( + "%6.1f MB maximum", + (curEntry.total_budget_in_bytes) / megabyte); + } drawTextLeftAligned(canvas, &paint, textRun2, text); return top + height + 2; diff --git a/cc/memory_history.h b/cc/memory_history.h index eca0a79..c46a29f 100644 --- a/cc/memory_history.h +++ b/cc/memory_history.h @@ -21,9 +21,12 @@ class MemoryHistory { struct Entry { Entry() - : bytes_allocated(0), + : total_budget_in_bytes(0), + bytes_allocated(0), + bytes_unreleasable(0), bytes_over(0) { } + size_t total_budget_in_bytes; size_t bytes_allocated; size_t bytes_unreleasable; size_t bytes_over; diff --git a/cc/tile_manager.cc b/cc/tile_manager.cc index d8ee9a3..2f95204 100644 --- a/cc/tile_manager.cc +++ b/cc/tile_manager.cc @@ -491,6 +491,8 @@ void TileManager::AssignGpuMemoryToTiles() { "budget", global_state_.memory_limit_in_bytes, "over", bytes_that_exceeded_memory_budget); } + memory_stats_from_last_assign_.total_budget_in_bytes = + global_state_.memory_limit_in_bytes; memory_stats_from_last_assign_.bytes_allocated = bytes_allocatable - bytes_left; memory_stats_from_last_assign_.bytes_unreleasable = unreleasable_bytes; |