allow GMs to animate

samplecode/SamplePicture.cpp

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "gm.h"
 
 #include "Resources.h"
@@ skipping 77 matching lines @@
         // the other references to fSubPicture
         fSubPicture->unref();
     }
 
     virtual ~PictureView() {
         fPicture->unref();
     }
 
 protected:
     // overrides from SkEventSink
-    virtual bool onQuery(SkEvent* evt) {
+    bool onQuery(SkEvent* evt) SK_OVERRIDE {
         if (SampleCode::TitleQ(*evt)) {
             SampleCode::TitleR(evt, "Picture");
             return true;
         }
         return this->INHERITED::onQuery(evt);
     }
 
     void drawSomething(SkCanvas* canvas) {
         SkPaint paint;
 
         canvas->save();
         canvas->scale(0.5f, 0.5f);
         canvas->drawBitmap(fBitmap, 0, 0, NULL);
         canvas->restore();
 
         paint.setAntiAlias(true);
 
         paint.setColor(SK_ColorRED);
         canvas->drawCircle(SkIntToScalar(50), SkIntToScalar(50),
                            SkIntToScalar(40), paint);
         paint.setColor(SK_ColorBLACK);
         paint.setTextSize(SkIntToScalar(40));
         canvas->drawText("Picture", 7, SkIntToScalar(50), SkIntToScalar(62),
                          paint);
 
     }
 
-    virtual void onDrawContent(SkCanvas* canvas) {
+    void onDrawContent(SkCanvas* canvas) SK_OVERRIDE {
         this->drawSomething(canvas);
 
         SkPictureRecorder recorder;
         this->drawSomething(recorder.beginRecording(100, 100, NULL, 0));
         SkAutoTUnref<SkPicture> pict(recorder.endRecording());
 
         canvas->save();
         canvas->translate(SkIntToScalar(300), SkIntToScalar(50));
         canvas->scale(-SK_Scalar1, -SK_Scalar1);
         canvas->translate(-SkIntToScalar(100), -SkIntToScalar(50));
         canvas->drawPicture(pict);
         canvas->restore();
 
         canvas->save();
         canvas->translate(SkIntToScalar(200), SkIntToScalar(150));
         canvas->scale(SK_Scalar1, -SK_Scalar1);
         canvas->translate(0, -SkIntToScalar(50));
         canvas->drawPicture(pict);
         canvas->restore();
 
         canvas->save();
         canvas->translate(SkIntToScalar(100), SkIntToScalar(100));
         canvas->scale(-SK_Scalar1, SK_Scalar1);
         canvas->translate(-SkIntToScalar(100), 0);
         canvas->drawPicture(pict);
         canvas->restore();
-
-#ifdef SK_DEVELOPER
-        if (false) {
-            SkDebugfDumper dumper;
-            SkDumpCanvas dumpCanvas(&dumper);
-            dumpCanvas.drawPicture(pict);
-        }
-#endif
-
-        // This used to re-record the sub-picture and redraw the parent
-        // A capability that is now forbidden!
-
-        SkRandom rand(SampleCode::GetAnimTime());
-        canvas->translate(SkIntToScalar(10), SkIntToScalar(250));
-        canvas->drawPicture(fPicture);
-        delayInval(500);
     }
 
 private:
     #define INVAL_ALL_TYPE  "inval-all"
 
     void delayInval(SkMSec delay) {
         (new SkEvent(INVAL_ALL_TYPE, this->getSinkID()))->postDelay(delay);
     }
 
-    virtual bool onEvent(const SkEvent& evt) {
+    bool onEvent(const SkEvent& evt) SK_OVERRIDE {
         if (evt.isType(INVAL_ALL_TYPE)) {
             this->inval(NULL);
             return true;
         }
         return this->INHERITED::onEvent(evt);
     }
 
     SkPicture*  fPicture;
     SkPicture*  fSubPicture;
 
     typedef SampleView INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 static SkView* MyFactory() { return new PictureView; }
 static SkViewRegister reg(MyFactory);