improvements of the FPS counter in the HUDLayer

cc/heads_up_display_layer_impl.h

Index: cc/heads_up_display_layer_impl.h
diff --git a/cc/heads_up_display_layer_impl.h b/cc/heads_up_display_layer_impl.h
index bcca76713e620db4403128e7543517abea8f2060..3276293f8a87b02cc60a7558a42f07f398be5b30 100644
--- a/cc/heads_up_display_layer_impl.h
+++ b/cc/heads_up_display_layer_impl.h
@@ -6,12 +6,15 @@
 #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_texture.h"
 
 class SkCanvas;
+class SkPaint;
+struct SkRect;
 
 namespace cc {
 
@@ -44,13 +47,19 @@ private:
     virtual const char* layerTypeAsString() const OVERRIDE;
 
     void drawHudContents(SkCanvas*);
-    void drawFPSCounter(SkCanvas*, FrameRateCounter*, int top, int height);
-    void drawFPSCounterText(SkCanvas*, FrameRateCounter*, int top, int width, int height);
+    int drawFPSCounter(SkCanvas*, FrameRateCounter*);
+    void drawFPSCounterText(SkCanvas*, SkPaint&, FrameRateCounter*, SkRect);
+    void drawFPSCounterGraph(SkCanvas*, SkPaint&, FrameRateCounter*, SkRect);
     void drawDebugRects(SkCanvas*, DebugRectHistory*);
 
     scoped_ptr<FontAtlas> m_fontAtlas;
     scoped_ptr<ScopedTexture> m_hudTexture;
     scoped_ptr<SkCanvas> m_hudCanvas;
+
+    double m_averageFPS;
+    double m_stdDeviation;
+
+    base::TimeTicks textUpdateTime;
 };
 
 }  // namespace cc