Adding fading effect for paint rectangles in HUD.

cc/layers/heads_up_display_layer_impl.cc

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/layers/heads_up_display_layer_impl.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/strings/stringprintf.h"
 #include "cc/debug/debug_colors.h"
-#include "cc/debug/debug_rect_history.h"
 #include "cc/debug/frame_rate_counter.h"
 #include "cc/debug/paint_time_counter.h"
 #include "cc/debug/traced_value.h"
 #include "cc/layers/quad_sink.h"
 #include "cc/output/renderer.h"
 #include "cc/quads/texture_draw_quad.h"
 #include "cc/resources/memory_history.h"
 #include "cc/trees/layer_tree_impl.h"
 #include "skia/ext/platform_canvas.h"
 #include "third_party/khronos/GLES2/gl2.h"
@@ skipping 41 matching lines @@
   current_upper_bound += (target_upper_bound - current_upper_bound) * 0.5;
   return current_upper_bound;
 }
 
 HeadsUpDisplayLayerImpl::HeadsUpDisplayLayerImpl(LayerTreeImpl* tree_impl,
                                                  int id)
     : LayerImpl(tree_impl, id),
       typeface_(skia::AdoptRef(
           SkTypeface::CreateFromName("monospace", SkTypeface::kBold))),
       fps_graph_(60.0, 80.0),
-      paint_time_graph_(16.0, 48.0) {}
+      paint_time_graph_(16.0, 48.0),
+      fade_step_(0) {}
 
 HeadsUpDisplayLayerImpl::~HeadsUpDisplayLayerImpl() {}
 
 scoped_ptr<LayerImpl> HeadsUpDisplayLayerImpl::CreateLayerImpl(
     LayerTreeImpl* tree_impl) {
   return HeadsUpDisplayLayerImpl::Create(tree_impl, id()).PassAs<LayerImpl>();
 }
 
 bool HeadsUpDisplayLayerImpl::WillDraw(DrawMode draw_mode,
                                        ResourceProvider* resource_provider) {
@@ skipping 133 matching lines @@
         memory_entry_ = **memory_history->End();
       else
         memory_entry_ = MemoryHistory::Entry();
     }
   }
 
   fps_graph_.UpdateUpperBound();
   paint_time_graph_.UpdateUpperBound();
 }
 
-void HeadsUpDisplayLayerImpl::DrawHudContents(SkCanvas* canvas) const {
+void HeadsUpDisplayLayerImpl::DrawHudContents(SkCanvas* canvas) {
   const LayerTreeDebugState& debug_state = layer_tree_impl()->debug_state();
 
-  if (debug_state.ShowHudRects())
+  if (debug_state.ShowHudRects()) {
     DrawDebugRects(canvas, layer_tree_impl()->debug_rect_history());
+    if (IsAnimatingHUDContents()) {
+      layer_tree_impl()->SetNeedsRedraw();
+    }
+  }
 
   SkRect area = SkRect::MakeEmpty();
   if (debug_state.continuous_painting) {
     area = DrawPaintTimeDisplay(
         canvas, layer_tree_impl()->paint_time_counter(), 0, 0);
   } else if (debug_state.show_fps_counter) {
     // Don't show the FPS display when continuous painting is enabled, because
     // it would show misleading numbers.
     area =
         DrawFPSDisplay(canvas, layer_tree_impl()->frame_rate_counter(), 0, 0);
@@ skipping 336 matching lines @@
                          1,
                          p * graph_bounds.height()),
         paint);
   }
 
   DrawGraphLines(canvas, &paint, graph_bounds, paint_time_graph_);
 
   return area;
 }
 
+void HeadsUpDisplayLayerImpl::DrawDebugRect(
+    SkCanvas* canvas,
+    SkPaint& paint,
+    const DebugRect& rect,
+    SkColor stroke_color,
+    SkColor fill_color,
+    float stroke_width,
+    const std::string& label_text) const {
+  gfx::RectF debug_layer_rect = gfx::ScaleRect(
+      rect.rect, 1.0 / contents_scale_x(), 1.0 / contents_scale_y());
+  SkRect sk_rect = RectFToSkRect(debug_layer_rect);
+  paint.setColor(fill_color);
+  paint.setStyle(SkPaint::kFill_Style);
+  canvas->drawRect(sk_rect, paint);
+
+  paint.setColor(stroke_color);
+  paint.setStyle(SkPaint::kStroke_Style);
+  paint.setStrokeWidth(SkFloatToScalar(stroke_width));
+  canvas->drawRect(sk_rect, paint);
+
+  if (label_text.length()) {
+    const int kFontHeight = 12;
+    const int kPadding = 3;
+
+    canvas->save();
+    canvas->clipRect(sk_rect);
+    canvas->translate(sk_rect.x(), sk_rect.y());
+
+    SkPaint label_paint = CreatePaint();
+    label_paint.setTextSize(kFontHeight);
+    label_paint.setTypeface(typeface_.get());
+    label_paint.setColor(stroke_color);
+
+    const SkScalar label_text_width =
+        label_paint.measureText(label_text.c_str(), label_text.length());
+    canvas->drawRect(SkRect::MakeWH(label_text_width + 2 * kPadding,
+                                    kFontHeight + 2 * kPadding),
+                     label_paint);
+
+    label_paint.setAntiAlias(true);
+    label_paint.setColor(SkColorSetARGB(255, 50, 50, 50));
+    canvas->drawText(label_text.c_str(),
+                     label_text.length(),
+                     kPadding,
+                     kFontHeight * 0.8f + kPadding,
+                     label_paint);
+
+    canvas->restore();
+  }
+}
+
 void HeadsUpDisplayLayerImpl::DrawDebugRects(
     SkCanvas* canvas,
-    DebugRectHistory* debug_rect_history) const {
+    DebugRectHistory* debug_rect_history) {
+  SkPaint paint = CreatePaint();
+
   const std::vector<DebugRect>& debug_rects = debug_rect_history->debug_rects();
-  SkPaint paint = CreatePaint();
+

[danakj, 2014/03/11 17:28:32]

nit: drop extra whitespace

[malch, 2014/03/12 07:22:53]

Done.

+  std::vector<DebugRect> new_paint_rects;
 
   for (size_t i = 0; i < debug_rects.size(); ++i) {
     SkColor stroke_color = 0;
     SkColor fill_color = 0;
     float stroke_width = 0.f;
     std::string label_text;
 
     switch (debug_rects[i].type) {
       case PAINT_RECT_TYPE:
-        stroke_color = DebugColors::PaintRectBorderColor();
-        fill_color = DebugColors::PaintRectFillColor();
-        stroke_width = DebugColors::PaintRectBorderWidth();
-        break;
+        new_paint_rects.push_back(debug_rects[i]);
+        fade_step_ = DebugColors::kFadeSteps;
+        continue;
       case PROPERTY_CHANGED_RECT_TYPE:
         stroke_color = DebugColors::PropertyChangedRectBorderColor();
         fill_color = DebugColors::PropertyChangedRectFillColor();
         stroke_width = DebugColors::PropertyChangedRectBorderWidth();
         break;
       case SURFACE_DAMAGE_RECT_TYPE:
         stroke_color = DebugColors::SurfaceDamageRectBorderColor();
         fill_color = DebugColors::SurfaceDamageRectFillColor();
         stroke_width = DebugColors::SurfaceDamageRectBorderWidth();
         break;
@@ skipping 36 matching lines @@
         label_text = "repaints on scroll";
         break;
       case ANIMATION_BOUNDS_RECT_TYPE:
         stroke_color = DebugColors::LayerAnimationBoundsBorderColor();
         fill_color = DebugColors::LayerAnimationBoundsFillColor();
         stroke_width = DebugColors::LayerAnimationBoundsBorderWidth();
         label_text = "animation bounds";
         break;
     }
 
-    gfx::RectF debug_layer_rect = gfx::ScaleRect(debug_rects[i].rect,
-                                                 1.0 / contents_scale_x(),
-                                                 1.0 / contents_scale_y());
-    SkRect sk_rect = RectFToSkRect(debug_layer_rect);
-    paint.setColor(fill_color);
-    paint.setStyle(SkPaint::kFill_Style);
-    canvas->drawRect(sk_rect, paint);
+    DrawDebugRect(canvas,
+                  paint,
+                  debug_rects[i],
+                  stroke_color,
+                  fill_color,
+                  stroke_width,
+                  label_text);
+  }
 
-    paint.setColor(stroke_color);
-    paint.setStyle(SkPaint::kStroke_Style);
-    paint.setStrokeWidth(SkFloatToScalar(stroke_width));
-    canvas->drawRect(sk_rect, paint);
-
-    if (label_text.length()) {
-      const int kFontHeight = 12;
-      const int kPadding = 3;
-
-      canvas->save();
-      canvas->clipRect(sk_rect);
-      canvas->translate(sk_rect.x(), sk_rect.y());
-
-      SkPaint label_paint = CreatePaint();
-      label_paint.setTextSize(kFontHeight);
-      label_paint.setTypeface(typeface_.get());
-      label_paint.setColor(stroke_color);
-
-      const SkScalar label_text_width =
-          label_paint.measureText(label_text.c_str(), label_text.length());
-      canvas->drawRect(SkRect::MakeWH(label_text_width + 2 * kPadding,
-                                      kFontHeight + 2 * kPadding),
-                       label_paint);
-
-      label_paint.setAntiAlias(true);
-      label_paint.setColor(SkColorSetARGB(255, 50, 50, 50));
-      canvas->drawText(label_text.c_str(),
-                       label_text.length(),
-                       kPadding,
-                       kFontHeight * 0.8f + kPadding,
-                       label_paint);
-
-      canvas->restore();
+  if (new_paint_rects.size()) {
+    paint_rects_.swap(new_paint_rects);

[danakj, 2014/03/11 17:28:32]

can you move the fade_step_ = DebugColors::kFadeSteps; down here? then we have
all the fade_step_ code together.

[malch, 2014/03/12 07:22:53]

Done.

+  }
+  if (fade_step_ > 0) {
+    fade_step_--;
+    for (size_t i = 0; i < paint_rects_.size(); ++i) {
+      DrawDebugRect(canvas,
+                    paint,
+                    paint_rects_[i],
+                    DebugColors::PaintRectBorderColor(fade_step_),
+                    DebugColors::PaintRectFillColor(fade_step_),
+                    DebugColors::PaintRectBorderWidth(),
+                    "");
     }
   }
 }
 
 const char* HeadsUpDisplayLayerImpl::LayerTypeAsString() const {
   return "cc::HeadsUpDisplayLayerImpl";
 }
 
 void HeadsUpDisplayLayerImpl::AsValueInto(base::DictionaryValue* dict) const {
   LayerImpl::AsValueInto(dict);
   dict->SetString("layer_name", "Heads Up Display Layer");
 }
 
 }  // namespace cc