Add default ctor to SkMask

bench/BlurRectBench.cpp

 /*
  * Copyright 2013 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 "SkBlurMask.h"
 #include "SkCanvas.h"
@@ skipping 45 matching lines @@
         this->setupPaint(&paint);
 
         paint.setAntiAlias(true);
 
         SkScalar pad = fRadius*3/2 + SK_Scalar1;
         SkRect r = SkRect::MakeWH(2 * pad + SK_Scalar1, 2 * pad + SK_Scalar1);
 
         preBenchSetup(r);
 
         for (int i = 0; i < loops; i++) {
-            makeBlurryRect(r);
+            this->makeBlurryRect(r);
         }
     }
 
     virtual void makeBlurryRect(const SkRect&) = 0;
     virtual void preBenchSetup(const SkRect&) {}
 private:
     typedef Benchmark INHERITED;
 };
 
 
 class BlurRectDirectBench: public BlurRectBench {
  public:
     BlurRectDirectBench(SkScalar rad) : INHERITED(rad) {
         SkString name;
 
         if (SkScalarFraction(rad) != 0) {
             name.printf("blurrect_direct_%.2f", SkScalarToFloat(rad));
         } else {
             name.printf("blurrect_direct_%d", SkScalarRoundToInt(rad));
         }
 
         this->setName(name);
     }
 protected:
     void makeBlurryRect(const SkRect& r) override {
         SkMask mask;
-        SkBlurMask::BlurRect(SkBlurMask::ConvertRadiusToSigma(this->radius()),
-                             &mask, r, kNormal_SkBlurStyle);
+        if (!SkBlurMask::BlurRect(SkBlurMask::ConvertRadiusToSigma(this->radius()),
+                                  &mask, r, kNormal_SkBlurStyle)) {
+            return;    
+        }
         SkMask::FreeImage(mask.fImage);
     }
 private:
     typedef BlurRectBench INHERITED;
 };
 
 class BlurRectSeparableBench: public BlurRectBench {
 
 public:
-    BlurRectSeparableBench(SkScalar rad) : INHERITED(rad) {
-        fSrcMask.fImage = nullptr;
-    }
+    BlurRectSeparableBench(SkScalar rad) : INHERITED(rad) { }
 
     ~BlurRectSeparableBench() {
         SkMask::FreeImage(fSrcMask.fImage);
     }
 
 protected:
     void preBenchSetup(const SkRect& r) override {
         SkMask::FreeImage(fSrcMask.fImage);
 
         r.roundOut(&fSrcMask.fBounds);
@@ skipping 20 matching lines @@
             name.printf("blurrect_boxfilter_%d", SkScalarRoundToInt(rad));
         }
 
         this->setName(name);
     }
 
 protected:
 
     void makeBlurryRect(const SkRect&) override {
         SkMask mask;
-        mask.fImage = nullptr;
-        SkBlurMask::BoxBlur(&mask, fSrcMask, SkBlurMask::ConvertRadiusToSigma(this->radius()),
-                            kNormal_SkBlurStyle, kHigh_SkBlurQuality);
+        if (!SkBlurMask::BoxBlur(&mask, fSrcMask, SkBlurMask::ConvertRadiusToSigma(this->radius()),
+                                 kNormal_SkBlurStyle, kHigh_SkBlurQuality)) {
+            return;
+        }
         SkMask::FreeImage(mask.fImage);
     }
 private:
     typedef BlurRectSeparableBench INHERITED;
 };
 
 class BlurRectGaussianBench: public BlurRectSeparableBench {
 public:
     BlurRectGaussianBench(SkScalar rad) : INHERITED(rad) {
         SkString name;
 
         if (SkScalarFraction(rad) != 0) {
             name.printf("blurrect_gaussian_%.2f", SkScalarToFloat(rad));
         } else {
             name.printf("blurrect_gaussian_%d", SkScalarRoundToInt(rad));
         }
 
         this->setName(name);
     }
 
 protected:
 
     void makeBlurryRect(const SkRect&) override {
         SkMask mask;
-        mask.fImage = nullptr;
-        SkBlurMask::BlurGroundTruth(SkBlurMask::ConvertRadiusToSigma(this->radius()),
-                                    &mask, fSrcMask, kNormal_SkBlurStyle);
+        if (!SkBlurMask::BlurGroundTruth(SkBlurMask::ConvertRadiusToSigma(this->radius()),
+                                         &mask, fSrcMask, kNormal_SkBlurStyle)) {
+            return;
+        }
         SkMask::FreeImage(mask.fImage);
     }
 private:
     typedef BlurRectSeparableBench INHERITED;
 };
 
 DEF_BENCH(return new BlurRectBoxFilterBench(SMALL);)
 DEF_BENCH(return new BlurRectBoxFilterBench(BIG);)
 DEF_BENCH(return new BlurRectBoxFilterBench(REALBIG);)
 DEF_BENCH(return new BlurRectBoxFilterBench(REAL);)
@@ skipping 32 matching lines @@
 DEF_BENCH(return new BlurRectGaussianBench(SkIntToScalar(12));)
 DEF_BENCH(return new BlurRectGaussianBench(SkIntToScalar(13));)
 DEF_BENCH(return new BlurRectGaussianBench(SkIntToScalar(14));)
 DEF_BENCH(return new BlurRectGaussianBench(SkIntToScalar(15));)
 DEF_BENCH(return new BlurRectGaussianBench(SkIntToScalar(16));)
 DEF_BENCH(return new BlurRectGaussianBench(SkIntToScalar(17));)
 DEF_BENCH(return new BlurRectGaussianBench(SkIntToScalar(18));)
 DEF_BENCH(return new BlurRectGaussianBench(SkIntToScalar(19));)
 DEF_BENCH(return new BlurRectGaussianBench(SkIntToScalar(20));)
 #endif