Switch internal testing ImageFilters over to new onFilterImage interface

gm/imagefiltersbase.cpp

 /*
  * Copyright 2011 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 "SkCanvas.h"
 #include "SkColorFilter.h"
 #include "SkColorPriv.h"
 #include "SkShader.h"
 
 #include "SkBlurImageFilter.h"
 #include "SkColorFilterImageFilter.h"
 #include "SkDropShadowImageFilter.h"
+#include "SkSpecialImage.h"
 #include "SkTestImageFilters.h"
 
 class FailImageFilter : public SkImageFilter {
 public:
     class Registrar {
     public:
         Registrar() {
             SkFlattenable::Register("FailImageFilter",
                                     FailImageFilter::CreateProc,
                                     FailImageFilter::GetFlattenableType());
         }
     };
     static sk_sp<SkImageFilter> Make() {
         return sk_sp<SkImageFilter>(new FailImageFilter);
     }
 
     SK_TO_STRING_OVERRIDE()
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(FailImageFilter)
 
 protected:
     FailImageFilter() : INHERITED(nullptr, 0, nullptr) {}
 
-    bool onFilterImageDeprecated(Proxy*, const SkBitmap& src, const Context&,
-                                 SkBitmap* result, SkIPoint* offset) const override {
-        return false;
+    sk_sp<SkSpecialImage> onFilterImage(SkSpecialImage* source, const Context&,
+                                        SkIPoint* offset) const override {
+        return nullptr;
     }
 
 private:
     typedef SkImageFilter INHERITED;
 };
 
 static FailImageFilter::Registrar gReg0;
 
 sk_sp<SkFlattenable> FailImageFilter::CreateProc(SkReadBuffer& buffer) {
     SK_IMAGEFILTER_UNFLATTEN_COMMON(common, 0);
@@ skipping 18 matching lines @@
         }
     };
     static sk_sp<SkImageFilter> Make(sk_sp<SkImageFilter> input) {
         return sk_sp<SkImageFilter>(new IdentityImageFilter(std::move(input)));
     }
 
     SK_TO_STRING_OVERRIDE()
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(IdentityImageFilter)
 
 protected:
-    bool onFilterImageDeprecated(Proxy*, const SkBitmap& src, const Context&,
-                                 SkBitmap* result, SkIPoint* offset) const override {
-        *result = src;
+    sk_sp<SkSpecialImage> onFilterImage(SkSpecialImage* source, const Context&,
+                                        SkIPoint* offset) const override {
         offset->set(0, 0);
-        return true;
+        return sk_ref_sp<SkSpecialImage>(source);

[Stephen White, 2016/04/04 17:02:42]

Let's not do this until we get the null_ptr-as-transparent-black issue sorted
out.

[robertphillips, 2016/04/04 18:08:31]

I seems like this is actually what this test image filter wants to do though
(i.e., just return the unmodified input).

[Stephen White, 2016/04/04 18:43:15]

Oh! Yeah, I guess it does. It's returning the source primitive, though, not its
input. Probably predates the DAG. Anyway this is fine.

     }
 
 private:
     IdentityImageFilter(sk_sp<SkImageFilter> input) : INHERITED(&input, 1, nullptr) {}
 
     typedef SkImageFilter INHERITED;
 };
 
 static IdentityImageFilter::Registrar gReg1;
 
@@ skipping 223 matching lines @@
 
 class ImageFiltersText_CF : public ImageFiltersTextBaseGM {
 public:
     ImageFiltersText_CF() : ImageFiltersTextBaseGM("color") {}
 
     void installFilter(SkPaint* paint) override {
         paint->setColorFilter(SkColorFilter::MakeModeFilter(SK_ColorBLUE, SkXfermode::kSrcIn_Mode));
     }
 };
 DEF_GM( return new ImageFiltersText_CF; )