Remove static bmp from shadertext3

gm/shadertext3.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 "SkCanvas.h"
 #include "SkGradientShader.h"
 #include "SkUnitMappers.h"
@@ skipping 29 matching lines @@
     canvas.drawPaint(paint);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 struct LabeledMatrix {
     SkMatrix    fMatrix;
     const char* fLabel;
 };
 
+static const char kText[] = "B";
+static const int kTextLen = SK_ARRAY_COUNT(kText) - 1;

[mtklein, 2014/03/26 20:47:17]

I love this.  AKA, 1.

[bsalomon, 2014/03/26 20:49:02]

:) I'll leave to you to guess where "B" comes from and why I didn't use both my
initials.

+static const int kPointSize = 300;
+
 class ShaderText3GM : public GM {
 public:
     ShaderText3GM() {
         this->setBGColor(0xFFDDDDDD);
     }
 
 protected:
 
-    SkString onShortName() {
+    virtual SkString onShortName() SK_OVERRIDE {
         return SkString("shadertext3");
     }
 
-    SkISize onISize() { return make_isize(800, 1000); }
+    virtual SkISize onISize() SK_OVERRIDE{ return make_isize(800, 1000); }
 
-    virtual void onDraw(SkCanvas* canvas) {
-        static const char kText[] = "B";
-        static const int kTextLen = SK_ARRAY_COUNT(kText) - 1;
-        static const int kPointSize = 300;
+    virtual void onOnceBeforeDraw() SK_OVERRIDE {
+        makebm(&fBmp, kPointSize / 4, kPointSize / 4);
+    }
 
-        static SkBitmap bmp;
-        if (bmp.isNull()) {
-            makebm(&bmp, kPointSize / 4, kPointSize / 4);
-        }
+    virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
 
         SkPaint bmpPaint;
         bmpPaint.setAntiAlias(true);
         bmpPaint.setFilterLevel(SkPaint::kLow_FilterLevel);
         bmpPaint.setAlpha(0x80);
-        canvas->drawBitmap(bmp, 5.f, 5.f, &bmpPaint);
+        canvas->drawBitmap(fBmp, 5.f, 5.f, &bmpPaint);
 
         SkPaint outlinePaint;
         outlinePaint.setAntiAlias(true);
         outlinePaint.setTextSize(SkIntToScalar(kPointSize));
         outlinePaint.setStyle(SkPaint::kStroke_Style);
         outlinePaint.setStrokeWidth(0.f);
 
         canvas->translate(15.f, 15.f);
 
         // draw glyphs scaled up
         canvas->scale(2.f, 2.f);
 
         static const SkShader::TileMode kTileModes[] = {
             SkShader::kRepeat_TileMode,
             SkShader::kMirror_TileMode,
         };
 
         // position the baseline of the first run
         canvas->translate(0.f, 0.75f * kPointSize);
 
         canvas->save();
         int i = 0;
         for (size_t tm0 = 0; tm0 < SK_ARRAY_COUNT(kTileModes); ++tm0) {
             for (size_t tm1 = 0; tm1 < SK_ARRAY_COUNT(kTileModes); ++tm1) {
-                SkAutoTUnref<SkShader> shader(SkShader::CreateBitmapShader(bmp,
+                SkAutoTUnref<SkShader> shader(SkShader::CreateBitmapShader(fBmp,
                                                                            kTileModes[tm0],
                                                                            kTileModes[tm1]));
                 SkMatrix localM;
                 localM.setTranslate(5.f, 5.f);
                 localM.postRotate(20);
                 localM.postScale(1.15f, .85f);
                 shader->setLocalMatrix(localM);
 
                 SkPaint fillPaint;
                 fillPaint.setAntiAlias(true);
@@ skipping 10 matching lines @@
                     canvas->restore();
                     canvas->translate(0, 0.75f * kPointSize);
                     canvas->save();
                 }
             }
         }
         canvas->restore();
     }
 
 private:
+    SkBitmap fBmp;
     typedef GM INHERITED;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 
 static GM* MyFactory(void*) { return new ShaderText3GM; }
 static GMRegistry reg(MyFactory);
 }