cc: PaintTimeCounter display on the HudLayer in continuous painting mode

cc/heads_up_display_layer_impl.h

 // 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.
 
 #ifndef CC_HEADS_UP_DISPLAY_LAYER_IMPL_H_
 #define CC_HEADS_UP_DISPLAY_LAYER_IMPL_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "base/time.h"
 #include "cc/cc_export.h"
 #include "cc/font_atlas.h"
 #include "cc/layer_impl.h"
 #include "cc/scoped_resource.h"
 
 class SkCanvas;
 class SkPaint;
 struct SkRect;
 
 namespace cc {
 
 class DebugRectHistory;
 class FontAtlas;
 class FrameRateCounter;
+class PaintTimeCounter;
 
 class CC_EXPORT HeadsUpDisplayLayerImpl : public LayerImpl {
 public:
     static scoped_ptr<HeadsUpDisplayLayerImpl> create(LayerTreeImpl* treeImpl, int id)
     {
         return make_scoped_ptr(new HeadsUpDisplayLayerImpl(treeImpl, id));
     }
     virtual ~HeadsUpDisplayLayerImpl();
 
     void setFontAtlas(scoped_ptr<FontAtlas>);
 
     virtual void willDraw(ResourceProvider*) OVERRIDE;
     virtual void appendQuads(QuadSink&, AppendQuadsData&) OVERRIDE;
     void updateHudTexture(ResourceProvider*);
     virtual void didDraw(ResourceProvider*) OVERRIDE;
 
     virtual void didLoseOutputSurface() OVERRIDE;
 
     virtual bool layerIsAlwaysDamaged() const OVERRIDE;
 
 private:
+    struct Graph {
+        Graph(double indicatorValue, double startUpperBound);
+
+        // Eases the upper bound, which limits what is currently visible in the graph,
+        // so that the graph always scales to either it's max or defaultUpperBound.
+        static double updateUpperBound(Graph*);

[egraether, 2013/01/16 00:53:03]

Renamed "high" to "upperBound".

+
+        double value;
+        double min;
+        double max;
+
+        double currentUpperBound;
+        const double defaultUpperBound;
+        const double indicator;
+    };
+
     HeadsUpDisplayLayerImpl(LayerTreeImpl* treeImpl, int id);
 
     virtual const char* layerTypeAsString() const OVERRIDE;
 
     void drawHudContents(SkCanvas*);
-    int drawFPSCounter(SkCanvas*, FrameRateCounter*);
-    void drawFPSCounterText(SkCanvas*, SkPaint&, FrameRateCounter*, SkRect);
-    void drawFPSCounterGraphAndHistogram(SkCanvas* canvas, SkPaint& paint, FrameRateCounter* fpsCounter, SkRect graphBounds, SkRect histogramBounds);
+
+    void drawTextLeftAligned(SkCanvas*, SkPaint*, const SkRect& bounds, const std::string& text);
+    void drawTextRightAligned(SkCanvas*, SkPaint*, const SkRect& bounds, const std::string& text);
+
+    void drawGraphBackground(SkCanvas*, SkPaint*, const SkRect& bounds);
+    void drawGraphLines(SkCanvas*, SkPaint*, const SkRect& bounds, const Graph&);
+
+    int drawFPSDisplay(SkCanvas*, FrameRateCounter*, const int& top);
+    int drawPaintTimeDisplay(SkCanvas*, PaintTimeCounter*, const int& top);
+
     void drawDebugRects(SkCanvas*, DebugRectHistory*);
 
     scoped_ptr<FontAtlas> m_fontAtlas;
     scoped_ptr<ScopedResource> m_hudTexture;
     scoped_ptr<SkCanvas> m_hudCanvas;
 
-    double m_averageFPS;
-    double m_minFPS;
-    double m_maxFPS;
+    Graph m_fpsGraph;
+    Graph m_paintTimeGraph;
 
-    base::TimeTicks textUpdateTime;
+    base::TimeTicks m_timeOfLastGraphUpdate;
 };
 
 }  // namespace cc
 
 #endif  // CC_HEADS_UP_DISPLAY_LAYER_IMPL_H_