Remove SkBlendImageFilter, and all tests. Its functionality has been subsumed by SkXfermodeImageFil…

gm/imagefiltersgraph.cpp

 /*
  * Copyright 2012 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 "SkBitmapSource.h"
-#include "SkBlendImageFilter.h"
 #include "SkBlurImageFilter.h"
 #include "SkColorFilter.h"
 #include "SkColorMatrixFilter.h"
 #include "SkColorFilterImageFilter.h"
 #include "SkMergeImageFilter.h"
 #include "SkMorphologyImageFilter.h"
+#include "SkXfermodeImageFilter.h"
 
 #include "SkTestImageFilters.h"
 
 ///////////////////////////////////////////////////////////////////////////////
 
 class ImageFiltersGraphGM : public skiagm::GM {
 public:
     ImageFiltersGraphGM() : fInitialized(false) {}
 
 protected:
@@ skipping 39 matching lines @@
         {
             SkAutoTUnref<SkImageFilter> morph(new SkDilateImageFilter(5, 5));
 
             SkScalar matrix[20] = { SK_Scalar1, 0, 0, 0, 0,
                                     0, SK_Scalar1, 0, 0, 0,
                                     0, 0, SK_Scalar1, 0, 0,
                                     0, 0, 0, SkFloatToScalar(0.5f), 0 };
 
             SkAutoTUnref<SkColorFilter> matrixFilter(new SkColorMatrixFilter(matrix));
             SkAutoTUnref<SkImageFilter> colorMorph(SkColorFilterImageFilter::Create(matrixFilter, morph));
-            SkAutoTUnref<SkImageFilter> blendColor(new SkBlendImageFilter(SkBlendImageFilter::kNormal_Mode, colorMorph));
+            SkAutoTUnref<SkXfermode> mode(SkXfermode::Create(SkXfermode::kSrcOver_Mode));
+            SkAutoTUnref<SkImageFilter> blendColor(new SkXfermodeImageFilter(mode, colorMorph));
 
             SkPaint paint;
             paint.setImageFilter(blendColor);
             canvas->drawBitmap(fBitmap, 100, 0, &paint);
         }
     }
 
 private:
     typedef GM INHERITED;
     SkBitmap fBitmap;
     bool fInitialized;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 
 static skiagm::GM* MyFactory(void*) { return new ImageFiltersGraphGM; }
 static skiagm::GMRegistry reg(MyFactory);