Revert "More general image filter interface; tested implementation of standalone"

This reverts commit 4df3e8b079e019af5f60c13e7e6ec6589663962a.

git-svn-id: http://skia.googlecode.com/svn/trunk@9937 2bbb7eff-a529-9590-31e7-b0007b416f81

2 files changed, 15 insertions, 129 deletions

diff --git a/gm/filterbitmap.cpp b/gm/filterbitmap.cpp
index 0afcb95101..830790c03c 100644
--- a/gm/filterbitmap.cpp
+++ b/gm/filterbitmap.cpp
@@ -35,7 +35,7 @@ static void draw_col(SkCanvas* canvas, const SkBitmap& bm, const SkMatrix& mat,
     canvas->translate(dx, 0);
     canvas->drawBitmapMatrix(bm, mat, &paint);
 
-    paint.setFlags(paint.getFlags() | SkPaint::kHighQualityFilterBitmap_Flag);
+    paint.setFlags(paint.getFlags() | SkPaint::kBicubicFilterBitmap_Flag);
     canvas->translate(dx, 0);
     canvas->drawBitmapMatrix(bm, mat, &paint);
 }
@@ -64,7 +64,7 @@ public:
         this->setBGColor(0xFFDDDDDD);
     }
 
-    void setName(const char name[]) {
+    void setName( const char name[] ) {
         fName.set(name);
     }
 
@@ -99,12 +99,12 @@ private:
 
 class FilterBitmapTextGM: public FilterBitmapGM {
   public:
-      FilterBitmapTextGM(float textSize)
-      : fTextSize(textSize)
+      FilterBitmapTextGM( float textSize )
+      : fTextSize( textSize )
         {
             char name[1024];
-            sprintf(name, "filterbitmap_text_%.2fpt", fTextSize);
-            setName(name);
+            sprintf( name, "filterbitmap_text_%.2fpt", fTextSize );
+            setName( name );
         }
 
   protected:
@@ -140,12 +140,12 @@ class FilterBitmapTextGM: public FilterBitmapGM {
 
 class FilterBitmapCheckerboardGM: public FilterBitmapGM {
   public:
-      FilterBitmapCheckerboardGM(int size, int num_checks)
-      : fSize(size), fNumChecks(num_checks)
+      FilterBitmapCheckerboardGM( int size, int num_checks )
+      : fSize( size ), fNumChecks( num_checks )
         {
             char name[1024];
-            sprintf(name, "filterbitmap_checkerboard_%d_%d", fSize, fNumChecks);
-            setName(name);
+            sprintf( name, "filterbitmap_checkerboard_%d_%d", fSize, fNumChecks );
+            setName( name );
         }
 
   protected:
@@ -179,12 +179,12 @@ class FilterBitmapCheckerboardGM: public FilterBitmapGM {
 
 class FilterBitmapImageGM: public FilterBitmapGM {
   public:
-      FilterBitmapImageGM(const char filename[])
-      : fFilename(filename)
+      FilterBitmapImageGM( const char filename[] )
+      : fFilename( filename )
         {
             char name[1024];
-            sprintf(name, "filterbitmap_image_%s", filename);
-            setName(name);
+            sprintf( name, "filterbitmap_image_%s", filename );
+            setName( name );
         }
 
   protected:
@@ -197,7 +197,7 @@ class FilterBitmapImageGM: public FilterBitmapGM {
 
       void make_bitmap() SK_OVERRIDE {
           SkString path(skiagm::GM::gResourcePath);
-          path.append("/");
+          path.append( "/" );
           path.append(fFilename);
 
           SkImageDecoder *codec = NULL;
diff --git a/gm/scalebitmap.cpp b/gm/scalebitmap.cpp
deleted file mode 100644
index 5d08ba85de..0000000000
--- a/gm/scalebitmap.cpp
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * 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 "gm.h"
-
-#include "SkImageDecoder.h"
-#include "SkStream.h"
-
-class ScaleBitmapGM : public skiagm::GM {
-    
-public:
-    
-    ScaleBitmapGM(const char filename[], float scale)
-        : fFilename(filename), fScale(scale)
-    {
-        this->setBGColor(0xFFDDDDDD);
-        fName.printf("scalebitmap_%s_%f", filename, scale);
-        
-        SkString path(skiagm::GM::gResourcePath);
-        path.append("/");
-        path.append(fFilename);
-
-        SkImageDecoder *codec = NULL;
-        SkFILEStream stream(path.c_str());
-        if (stream.isValid()) {
-            codec = SkImageDecoder::Factory(&stream);
-        }
-        if (codec) {
-            stream.rewind();
-            codec->decode(&stream, &fBM, SkBitmap::kARGB_8888_Config,
-                SkImageDecoder::kDecodePixels_Mode);
-            SkDELETE(codec);
-        } else {
-            fBM.setConfig(SkBitmap::kARGB_8888_Config, 1, 1);
-            fBM.allocPixels();
-            *(fBM.getAddr32(0,0)) = 0xFF0000FF; // red == bad
-        }
-        fSize = fBM.height();
-    }
-
-protected:
-    
-    
-    SkBitmap    fBM;
-    SkString    fName;
-    SkString    fFilename;
-    int         fSize;
-    float       fScale;
-    
-    
-    virtual SkString onShortName() SK_OVERRIDE {
-        return fName;
-    }
-
-    virtual SkISize onISize() SK_OVERRIDE {
-        return SkISize::Make(fBM.width() * fScale, fBM.height() * fScale);
-    }
-
-    virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
-        SkBitmap dst;
-        dst.setConfig(SkBitmap::kARGB_8888_Config, fBM.width() * fScale, fBM.height() * fScale);
-        dst.allocPixels();
-        fBM.scale(&dst);
-        
-        canvas->drawBitmap(dst, 0, 0);
-    }
-
-private:
-    typedef skiagm::GM INHERITED;
-};
-
-class ScaleBitmapMipmapGM: public ScaleBitmapGM {
-    SkMatrix fMatrix;
-    
-public:
-    ScaleBitmapMipmapGM(const char filename[], float scale)
-        : INHERITED(filename, scale)
-    {
-        fName.printf("scalebitmap_mipmap_%s_%f", filename, scale);
-        fBM.buildMipMap();
-        fMatrix.setScale(scale, scale);
-    }
-protected:
-    virtual void onDraw(SkCanvas *canvas) SK_OVERRIDE {
-        SkPaint paint;
-        
-        paint.setFilterBitmap(true);
-        canvas->drawBitmapMatrix(fBM, fMatrix, &paint);
-    }
-private:
-     typedef ScaleBitmapGM INHERITED;  
-};
-
-//////////////////////////////////////////////////////////////////////////////
-
-DEF_GM( return new ScaleBitmapGM("mandrill_128.png", 2); )
-DEF_GM( return new ScaleBitmapGM("mandrill_64.png", 4); )
-DEF_GM( return new ScaleBitmapGM("mandrill_32.png", 8); )
-DEF_GM( return new ScaleBitmapGM("mandrill_16.png", 16); )
-
-DEF_GM( return new ScaleBitmapGM("nature.jpg", 0.5f); )
-DEF_GM( return new ScaleBitmapGM("nature.jpg", 0.25f); )
-DEF_GM( return new ScaleBitmapGM("nature.jpg", 0.125f); )
-DEF_GM( return new ScaleBitmapGM("nature.jpg", 0.0625f); )
-
-DEF_GM( return new ScaleBitmapMipmapGM("nature.jpg", 0.5f); )
-DEF_GM( return new ScaleBitmapMipmapGM("nature.jpg", 0.25f); )
-DEF_GM( return new ScaleBitmapMipmapGM("nature.jpg", 0.125f); )
-DEF_GM( return new ScaleBitmapMipmapGM("nature.jpg", 0.0625f); )
-