commit f21833999d90ad9c8c584cff3238797b39cfc00b
author reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri Apr 22 14:10:48 2011 +0000
committer reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri Apr 22 14:10:48 2011 +0000
tree a9d07155d6567708fff2796d46fae62534e7e1ff
parent 2eb595292b9624371d1698ae9da7accb4c09c26c

migrate some samples over to SampleView, for FPS measurements



git-svn-id: http://skia.googlecode.com/svn/trunk@1166 2bbb7eff-a529-9590-31e7-b0007b416f81

samplecode/SampleShapes.cpp

diff --git a/samplecode/SampleShapes.cpp b/samplecode/SampleShapes.cpp
index a175af6..dc10f1a 100644
--- a/samplecode/SampleShapes.cpp
+++ b/samplecode/SampleShapes.cpp
@@ -46,7 +46,7 @@
 
 ///////////////////////////////////////////////////////////////////////////////
 
-class ShapesView : public SkView {
+class ShapesView : public SampleView {
     SkGroupShape fGroup;
     SkMatrixRef*    fMatrixRefs[4];
 public:
@@ -65,6 +65,8 @@
         for (size_t i = 0; i < SK_ARRAY_COUNT(fMatrixRefs); i++) {
             SkSafeRef(fMatrixRefs[i] = fGroup.getShapeMatrixRef(i));
         }
+
+        this->setBGColor(0xFFDDDDDD);
     }
     
     virtual ~ShapesView() {
@@ -83,10 +85,6 @@
         return this->INHERITED::onQuery(evt);
     }
     
-    void drawBG(SkCanvas* canvas) {
-        canvas->drawColor(0xFFDDDDDD);
-    }
-    
     void drawpicture(SkCanvas* canvas, SkPicture& pict) {
 #if 0
         SkDynamicMemoryWStream ostream;
@@ -101,9 +99,7 @@
 #endif
     }
     
-    virtual void onDraw(SkCanvas* canvas) {
-        this->drawBG(canvas);
-        
+    virtual void onDrawContent(SkCanvas* canvas) {
         SkScalar angle = SampleCode::GetAnimScalar(SkIntToScalar(180),
                                                    SkIntToScalar(360));
 
@@ -154,7 +150,7 @@
 }
     
 private:
-    typedef SkView INHERITED;
+    typedef SampleView INHERITED;
 };
 
 ///////////////////////////////////////////////////////////////////////////////