Move font loading in gm tests and benches out of constructors

bench/TextBench.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 "Benchmark.h"
 #include "Resources.h"
@@ skipping 34 matching lines @@
     SkPaint     fPaint;
     SkString    fText;
     SkString    fName;
     FontQuality fFQ;
     bool        fDoPos;
     bool        fDoColorEmoji;
     SkAutoTUnref<SkTypeface> fColorEmojiTypeface;
     SkPoint*    fPos;
 public:
     TextBench(const char text[], int ps,
-              SkColor color, FontQuality fq, bool doColorEmoji = false, bool doPos = false)  {
-        fPos = NULL;
-        fFQ = fq;
-        fDoPos = doPos;
-        fDoColorEmoji = doColorEmoji;
-        fText.set(text);
-
+              SkColor color, FontQuality fq, bool doColorEmoji = false, bool doPos = false)
+        : fText(text)
+        , fFQ(fq)
+        , fDoPos(doPos)
+        , fDoColorEmoji(doColorEmoji)
+        , fPos(NULL) {
         fPaint.setAntiAlias(kBW != fq);
         fPaint.setLCDRenderText(kLCD == fq);
         fPaint.setTextSize(SkIntToScalar(ps));
         fPaint.setColor(color);
+    }
 
-        if (doColorEmoji) {
+    virtual ~TextBench() {
+        delete[] fPos;
+    }
+
+protected:
+    void onPreDraw() override {
+        if (fDoColorEmoji) {
             SkASSERT(kBW == fFQ);
             fColorEmojiTypeface.reset(GetResourceAsTypeface("/fonts/Funkster.ttf"));
         }
 
-        if (doPos) {
-            size_t len = strlen(text);
+        if (fDoPos) {
+            size_t len = fText.size();
             SkScalar* adv = new SkScalar[len];
-            fPaint.getTextWidths(text, len, adv);
+            fPaint.getTextWidths(fText.c_str(), len, adv);
             fPos = new SkPoint[len];
             SkScalar x = 0;
             for (size_t i = 0; i < len; ++i) {
                 fPos[i].set(x, SkIntToScalar(50));
                 x += adv[i];
             }
             delete[] adv;
         }
     }
 
-    virtual ~TextBench() {
-        delete[] fPos;
-    }
 
-protected:
     virtual const char* onGetName() {
         fName.printf("text_%g", SkScalarToFloat(fPaint.getTextSize()));

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

Kind of weird that this builds fName in place then returns it, isn't it?  You'd
think either we have no fName field or this just returns fName.c_str() having
already been formatted in the constructor or something.  Odd.

         if (fDoPos) {
             fName.append("_pos");
         }
         fName.appendf("_%s", fontQualityName(fPaint));
         if (SK_ColorBLACK != fPaint.getColor()) {
             fName.appendf("_%02X", fPaint.getAlpha());
         } else {
             fName.append("_BK");
         }
 
-        if (fDoColorEmoji && fColorEmojiTypeface) {
+        if (fDoColorEmoji) {
             fName.append("_ColorEmoji");
         }
 
         return fName.c_str();
     }
 
     virtual void onDraw(const int loops, SkCanvas* canvas) {
         const SkIPoint dim = this->getSize();
         SkRandom rand;
 
@@ skipping 47 matching lines @@
 DEF_BENCH( return new TextBench(STR, 16, 0xFF000000, kLCD); )
 DEF_BENCH( return new TextBench(STR, 16, 0xFFFF0000, kLCD); )
 DEF_BENCH( return new TextBench(STR, 16, 0x88FF0000, kLCD); )
 
 DEF_BENCH( return new TextBench(STR, 16, 0xFF000000, kBW, true); )
 DEF_BENCH( return new TextBench(STR, 16, 0xFFFF0000, kBW, true); )
 DEF_BENCH( return new TextBench(STR, 16, 0x88FF0000, kBW, true); )
 
 DEF_BENCH( return new TextBench(STR, 16, 0xFF000000, kBW, true, true); )
 DEF_BENCH( return new TextBench(STR, 16, 0xFF000000, kAA, false, true); )