stop using bitmap-filter flags outside of paint itself, as a step towards really changing them into…

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"
@@ skipping 78 matching lines @@
 class BitmapFilterScaleBench: public BitmapScaleBench {
  public:
     BitmapFilterScaleBench(void *param, int is, int os) : INHERITED(param, is, os) {
         setName( "filter" );
     }
 protected:
     virtual void doScaleImage() SK_OVERRIDE {
         SkCanvas canvas( fOutputBitmap );
         SkPaint paint;
 
-        paint.setFlags( SkPaint::kHighQualityFilterBitmap_Flag | SkPaint::kFilterBitmap_Flag );
-
+        paint.setFilterLevel(SkPaint::kHigh_FilterLevel);
         canvas.drawBitmapMatrix( fInputBitmap, fMatrix, &paint );
     }
 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 BitmapFilterScaleBench(p, 256, 64);)
 DEF_BENCH(return new BitmapFilterScaleBench(p, 64, 256);)