Move font loading in gm tests and benches out of constructors

gm/typeface.cpp

 /*
  * Copyright 2012 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 "SkString.h"
 #include "SkTypeface.h"
 #include "SkTypes.h"
 
 static const char* gFaces[] = {
     "Times Roman",
     "Hiragino Maru Gothic Pro",
     "Papyrus",
     "Helvetica",
     "Courier New"
 };
 
 class TypefaceGM : public skiagm::GM {
 public:
-    TypefaceGM() {
+    TypefaceGM()
+        : fFaces(NULL) {
+    }
+
+    virtual ~TypefaceGM() {
+        if (fFaces) {
+            for (size_t i = 0; i < SK_ARRAY_COUNT(gFaces); i++) {
+                SkSafeUnref(fFaces[i]);
+            }
+            delete [] fFaces;
+        }
+    }
+
+protected:
+    void onOnceBeforeDraw() override {
         fFaces = new SkTypeface*[SK_ARRAY_COUNT(gFaces)];
         for (size_t i = 0; i < SK_ARRAY_COUNT(gFaces); i++) {
             fFaces[i] = sk_tool_utils::create_portable_typeface(gFaces[i], SkTypeface::kNormal);
         }
     }
 
-    virtual ~TypefaceGM() {
-        for (size_t i = 0; i < SK_ARRAY_COUNT(gFaces); i++) {
-            SkSafeUnref(fFaces[i]);
-        }
-        delete [] fFaces;
-    }
-
-protected:
     SkString onShortName() override {
         return SkString("typeface");
     }
 
     SkISize onISize() override {
         return SkISize::Make(640, 480);
     }
 
     void onDraw(SkCanvas* canvas) override {
         SkString text("Typefaces are fun!");
@@ skipping 101 matching lines @@
     { "monospace", SkTypeface::kBoldItalic },
 };
 
 static const int gFaceStylesCount = SK_ARRAY_COUNT(gFaceStyles);
 
 class TypefaceStylesGM : public skiagm::GM {
     SkTypeface* fFaces[gFaceStylesCount];
     bool fApplyKerning;
 
 public:
-    TypefaceStylesGM(bool applyKerning) : fApplyKerning(applyKerning) {
-        for (int i = 0; i < gFaceStylesCount; i++) {
-            fFaces[i] = sk_tool_utils::create_portable_typeface(gFaceStyles[i].fName,
-                                                         gFaceStyles[i].fStyle);
-        }
+    TypefaceStylesGM(bool applyKerning)
+        : fApplyKerning(applyKerning) {
+        memset(fFaces, 0, sizeof(fFaces));

[mtklein, 2015/05/21 13:09:25]

Just FYI, we usually use sk_bzero for this so we don't accidentally mix up where
the pointer, value, and size go.

     }
 
     virtual ~TypefaceStylesGM() {
         for (int i = 0; i < gFaceStylesCount; i++) {
             SkSafeUnref(fFaces[i]);
         }
     }
 
 protected:
+    void onOnceBeforeDraw() override {
+        for (int i = 0; i < gFaceStylesCount; i++) {
+            fFaces[i] = sk_tool_utils::create_portable_typeface(gFaceStyles[i].fName,
+                                                         gFaceStyles[i].fStyle);
+        }
+    }
+
     SkString onShortName() override {
         SkString name("typefacestyles");
         if (fApplyKerning) {
             name.append("_kerning");
         }
         return name;
     }
 
     SkISize onISize() override {
         return SkISize::Make(640, 480);
@@ skipping 28 matching lines @@
 
 private:
     typedef skiagm::GM INHERITED;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 
 DEF_GM( return new TypefaceGM; )
 DEF_GM( return new TypefaceStylesGM(false); )
 DEF_GM( return new TypefaceStylesGM(true); )