Switch SkImageSource image filter over to new onFilterImage interface

src/core/SkSpecialImage.cpp

 /*
  * Copyright 2016 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file
  */
 
 #include "SkCanvas.h"
 #include "SkImage_Base.h"
 #include "SkSpecialImage.h"
@@ skipping 120 matching lines @@
                               dst, paint, SkCanvas::kStrict_SrcRectConstraint);
     }
 
     bool testingOnlyOnPeekPixels(SkPixmap* pixmap) const override {
         return fImage->peekPixels(pixmap);
     }
 
     GrTexture* onPeekTexture() const override { return as_IB(fImage.get())->peekTexture(); }
 
     bool getBitmap(SkBitmap* result) const override {
-        return false;
+        if (GrTexture* texture = as_IB(fImage.get())->peekTexture()) {
+            const SkImageInfo info = GrMakeInfoFromTexture(texture, 
+                                                           fImage->width(), fImage->height(),
+                                                           fImage->isOpaque());
+            if (!result->setInfo(info)) {
+                return false;
+            }
+
+            result->setPixelRef(new SkGrPixelRef(info, texture))->unref();

[Stephen White, 2016/03/07 21:47:26]

I think this will break the no-GPU build, and probably should be wrapped in an
#if SK_SUPPORT_GPU.

(and maybe getBitmap() should also be getBitmapDeprecated()?)

[robertphillips, 2016/03/08 16:45:29]

Done.

I'll rename getBitmap in a separate CL though.

+            return true;
+        }
+
+        return as_IB(fImage.get())->asBitmapForImageFilters(result);
     }
 
     bool testingOnlyOnGetROPixels(SkBitmap* result) const override {
-        return false;
+        return fImage->asLegacyBitmap(result, SkImage::kRO_LegacyBitmapMode);
     }
 
     SkSpecialSurface* onNewSurface(const SkImageInfo& info) const override {
 #if SK_SUPPORT_GPU
         GrTexture* texture = as_IB(fImage.get())->peekTexture();
         if (texture) {
             GrSurfaceDesc desc = GrImageInfoToSurfaceDesc(info);
             desc.fFlags = kRenderTarget_GrSurfaceFlag;
 
             return SkSpecialSurface::NewRenderTarget(this->proxy(), texture->getContext(), desc);
@@ skipping 15 matching lines @@
         return true;
     }
 
     return rect.fLeft >= 0 && rect.fLeft < width && rect.fLeft < rect.fRight &&
            rect.fRight >= 0 && rect.fRight <= width &&
            rect.fTop >= 0 && rect.fTop < height && rect.fTop < rect.fBottom &&
            rect.fBottom >= 0 && rect.fBottom <= height;
 }
 #endif
 
-SkSpecialImage* SkSpecialImage::NewFromImage(const SkIRect& subset, const SkImage* image) {
+SkSpecialImage* SkSpecialImage::NewFromImage(SkImageFilter::Proxy* proxy,
+                                             const SkIRect& subset,
+                                             const SkImage* image) {
     SkASSERT(rect_fits(subset, image->width(), image->height()));
-    return new SkSpecialImage_Image(nullptr, subset, image);
+    return new SkSpecialImage_Image(proxy, subset, image);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 #include "SkBitmap.h"
 #include "SkImageInfo.h"
 #include "SkPixelRef.h"
 
 class SkSpecialImage_Raster : public SkSpecialImage_Base {
 public:
     SkSpecialImage_Raster(SkImageFilter::Proxy* proxy, const SkIRect& subset, const SkBitmap& bm)
@@ skipping 157 matching lines @@
 
 SkSpecialImage* SkSpecialImage::NewFromGpu(SkImageFilter::Proxy* proxy,
                                            const SkIRect& subset,
                                            uint32_t uniqueID,
                                            GrTexture* tex,
                                            SkAlphaType at) {
     return nullptr;
 }
 
 #endif