reenable the scale benchmark, and only bench actual canvas draw commands

bench/BitmapScaleBench.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 "SkBenchmark.h"
 #include "SkCanvas.h"
 #include "SkPaint.h"
 #include "SkRandom.h"
 #include "SkShader.h"
 #include "SkString.h"
 #include "SkBlurMask.h"
 
 class BitmapScaleBench: public SkBenchmark {
     int         fLoopCount;
     int         fInputSize;
     int         fOutputSize;
     SkString    fName;
 
 public:
     BitmapScaleBench(void *param, int is, int os) : INHERITED(param) {
         fInputSize = is;
         fOutputSize = os;
 
-        fLoopCount = 100;
+        fLoopCount = 20;
     }
 
 protected:
 
     SkBitmap fInputBitmap, fOutputBitmap;
     SkMatrix fMatrix;
 
     virtual const char* onGetName() {
         return fName.c_str();
     }
@@ skipping 59 matching lines @@
         SkPaint paint;
 
         paint.setFlags( SkPaint::kHighQualityFilterBitmap_Flag | SkPaint::kFilterBitmap_Flag );
 
         canvas.drawBitmapMatrix( fInputBitmap, fMatrix, &paint );
     }
 private:
     typedef BitmapScaleBench INHERITED;
 };
 
-class BitmapDirectScaleBench: public BitmapScaleBench {
- public:
-    BitmapDirectScaleBench(void *param, int is, int os) : INHERITED(param, is, os) {
-        setName( "direct" );
-    }
-protected:
-    virtual void doScaleImage() SK_OVERRIDE {
-        fInputBitmap.scale( &fOutputBitmap );
-    }
-private:
-    typedef BitmapScaleBench INHERITED;
-};
-
-
 DEF_BENCH(return new BitmapFilterScaleBench(p, 10, 90);)
 DEF_BENCH(return new BitmapFilterScaleBench(p, 30, 90);)
 DEF_BENCH(return new BitmapFilterScaleBench(p, 80, 90);)
-// DEF_BENCH(return new BitmapFilterScaleBench(p, 90, 90);)
-// DEF_BENCH(return new BitmapFilterScaleBench(p, 90, 80);)
-// DEF_BENCH(return new BitmapFilterScaleBench(p, 90, 30);)
-// DEF_BENCH(return new BitmapFilterScaleBench(p, 90, 10);)
-
-DEF_BENCH(return new BitmapDirectScaleBench(p, 10, 90);)
-DEF_BENCH(return new BitmapDirectScaleBench(p, 30, 90);)
-DEF_BENCH(return new BitmapDirectScaleBench(p, 80, 90);)
-// DEF_BENCH(return new BitmapDirectScaleBench(p, 90, 90);)
-// DEF_BENCH(return new BitmapDirectScaleBench(p, 90, 80);)
-// DEF_BENCH(return new BitmapDirectScaleBench(p, 90, 30);)
-// DEF_BENCH(return new BitmapDirectScaleBench(p, 90, 10);)
+DEF_BENCH(return new BitmapFilterScaleBench(p, 90, 90);)
+DEF_BENCH(return new BitmapFilterScaleBench(p, 90, 80);)
+DEF_BENCH(return new BitmapFilterScaleBench(p, 90, 30);)
+DEF_BENCH(return new BitmapFilterScaleBench(p, 90, 10);)
+DEF_BENCH(return new BitmapFilterScaleBench(p, 256, 64);)
+DEF_BENCH(return new BitmapFilterScaleBench(p, 64, 256);)