Skip to content

Commit

Permalink
cc: Only show GPU status if fps or paint time is up
Browse files Browse the repository at this point in the history
The GPU status is currently showing if "Show paint rectangles" or
"Show potential scroll bottlenecks" is up, but was only meant to
be displayed for the fps and paint time meters.

This was caused by my previous change:
https://codereview.chromium.org/774943005

BUG=

Review URL: https://codereview.chromium.org/805293002

Cr-Commit-Position: refs/heads/master@{#308610}
  • Loading branch information
hendrikw authored and Commit bot committed Dec 16, 2014
1 parent dce2a85 commit 5f800e1
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions cc/layers/heads_up_display_layer_impl.cc
Original file line number Diff line number Diff line change
Expand Up @@ -279,8 +279,10 @@ void HeadsUpDisplayLayerImpl::DrawHudContents(SkCanvas* canvas) {
DrawFPSDisplay(canvas, layer_tree_impl()->frame_rate_counter(), 0, 0);
}

area = DrawGpuRasterizationStatus(canvas, 0, area.bottom(),
SkMaxScalar(area.width(), 150));
if (debug_state.show_fps_counter || debug_state.continuous_painting) {
area = DrawGpuRasterizationStatus(canvas, 0, area.bottom(),
SkMaxScalar(area.width(), 150));
}

if (debug_state.ShowMemoryStats())
DrawMemoryDisplay(canvas, 0, area.bottom(), SkMaxScalar(area.width(), 150));
Expand Down

0 comments on commit 5f800e1

Please sign in to comment.