Switch internal testing ImageFilters over to new onFilterImage interface

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 "SkArithmeticMode.h"
-#include "SkDevice.h"
 #include "SkBlurImageFilter.h"
 #include "SkColorFilter.h"
 #include "SkColorFilterImageFilter.h"
 #include "SkColorMatrixFilter.h"
 #include "SkImage.h"
 #include "SkImageSource.h"
 #include "SkMatrixConvolutionImageFilter.h"
 #include "SkReadBuffer.h"
+#include "SkSpecialImage.h"
+#include "SkSpecialSurface.h"
 #include "SkWriteBuffer.h"
 #include "SkMergeImageFilter.h"
 #include "SkMorphologyImageFilter.h"
 #include "SkTestImageFilters.h"
 #include "SkXfermodeImageFilter.h"
 
 // More closely models how Blink's OffsetFilter works as of 10/23/13. SkOffsetImageFilter doesn't

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

Blink's OffsetFilter doesn't exist anymore. We should probably replace this with
SkOffsetImageFilter.

 // perform a draw and this one does.
 class SimpleOffsetFilter : public SkImageFilter {
 public:
     class Registrar {
     public:
         Registrar() {
             SkFlattenable::Register("SimpleOffsetFilter",
                                     SimpleOffsetFilter::CreateProc,
                                     SimpleOffsetFilter::GetFlattenableType());
         }
     };
     static sk_sp<SkImageFilter> Make(SkScalar dx, SkScalar dy, sk_sp<SkImageFilter> input) {
         return sk_sp<SkImageFilter>(new SimpleOffsetFilter(dx, dy, std::move(input)));
     }
 
     SK_TO_STRING_OVERRIDE()
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SimpleOffsetFilter);
 
 protected:
-    bool onFilterImageDeprecated(Proxy* proxy, const SkBitmap& src, const Context& ctx,
-                                 SkBitmap* dst, SkIPoint* offset) const override {
-        SkBitmap source = src;
-        SkIPoint srcOffset = SkIPoint::Make(0, 0);
-        if (!this->filterInputDeprecated(0, proxy, src, ctx, &source, &srcOffset)) {
-            return false;
+    sk_sp<SkSpecialImage> onFilterImage(SkSpecialImage* source, const Context& ctx,
+                                        SkIPoint* offset) const override {
+        SkIPoint inputOffset = SkIPoint::Make(0, 0);
+        sk_sp<SkSpecialImage> input(this->filterInput(0, source, ctx, &inputOffset));
+        if (!input) {
+            return nullptr;
         }
 
         SkIRect bounds;
-        if (!this->applyCropRectDeprecated(ctx, proxy, source, &srcOffset, &bounds, &source)) {
-            return false;
+        input = this->applyCropRect(ctx, input.get(), &inputOffset, &bounds);
+        if (!input) {
+            return nullptr;
         }
 
-        SkAutoTUnref<SkBaseDevice> device(proxy->createDevice(bounds.width(), bounds.height()));
-        SkCanvas canvas(device);
+        SkImageInfo info = SkImageInfo::MakeN32Premul(bounds.width(), bounds.height());
+
+        sk_sp<SkSpecialSurface> surf(source->makeSurface(info));
+        if (!surf) {
+            return nullptr;
+        }
+
+        SkCanvas* canvas = surf->getCanvas();
+        SkASSERT(canvas);
+
         SkPaint paint;
         paint.setXfermodeMode(SkXfermode::kSrc_Mode);
-        canvas.drawBitmap(source, fDX - bounds.left(), fDY - bounds.top(), &paint);
-        *dst = device->accessBitmap(false);
+
+        input->draw(canvas, fDX - bounds.left(), fDY - bounds.top(), &paint);
+
         offset->fX += bounds.left();
         offset->fY += bounds.top();
-        return true;
+        return surf->makeImageSnapshot();
     }
 
     void flatten(SkWriteBuffer& buffer) const override {
         this->INHERITED::flatten(buffer);
         buffer.writeScalar(fDX);
         buffer.writeScalar(fDY);
     }
 
 private:
     SimpleOffsetFilter(SkScalar dx, SkScalar dy, sk_sp<SkImageFilter> input)
@@ skipping 165 matching lines @@
     }
 
     sk_sp<SkImage> fImage;
 
     typedef GM INHERITED;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 
 DEF_GM(return new ImageFiltersGraphGM;)