Make filters use SkImage instead of SkBitmap

tests/ImageFilterTest.cpp

 /*
  * 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 "SkBitmap.h"
 #include "SkBitmapDevice.h"
 #include "SkBitmapSource.h"
 #include "SkBlurImageFilter.h"
 #include "SkCanvas.h"
 #include "SkColorFilterImageFilter.h"
 #include "SkColorMatrixFilter.h"
 #include "SkComposeImageFilter.h"
 #include "SkDeviceImageFilterProxy.h"
 #include "SkDisplacementMapEffect.h"
 #include "SkDropShadowImageFilter.h"
 #include "SkFlattenableSerialization.h"
 #include "SkGradientShader.h"
+#include "SkImagePriv.h"
+#include "SkImage_Base.h"
 #include "SkLightingImageFilter.h"
 #include "SkMatrixConvolutionImageFilter.h"
 #include "SkMatrixImageFilter.h"
 #include "SkMergeImageFilter.h"
 #include "SkMorphologyImageFilter.h"
 #include "SkOffsetImageFilter.h"
 #include "SkPerlinNoiseShader.h"
 #include "SkPicture.h"
 #include "SkPictureImageFilter.h"
 #include "SkPictureRecorder.h"
@@ skipping 12 matching lines @@
 static const int kBitmapSize = 4;
 
 namespace {
 
 class MatrixTestImageFilter : public SkImageFilter {
 public:
     MatrixTestImageFilter(skiatest::Reporter* reporter, const SkMatrix& expectedMatrix)
       : SkImageFilter(0, NULL), fReporter(reporter), fExpectedMatrix(expectedMatrix) {
     }
 
-    virtual bool onFilterImage(Proxy*, const SkBitmap& src, const Context& ctx,
-                               SkBitmap* result, SkIPoint* offset) const SK_OVERRIDE {
+    virtual bool onFilterImage(Proxy*, const SkImage* src, const Context& ctx,
+                               SkAutoTUnref<const SkImage>& result, SkIPoint* offset) const SK_OVERRIDE {
         REPORTER_ASSERT(fReporter, ctx.ctm() == fExpectedMatrix);
+        result.reset(SkRef(src));
         return true;
     }
 
     SK_TO_STRING_OVERRIDE()
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(MatrixTestImageFilter)
 
 protected:
     void flatten(SkWriteBuffer& buffer) const SK_OVERRIDE {
         this->INHERITED::flatten(buffer);
         buffer.writeFunctionPtr(fReporter);
@@ skipping 161 matching lines @@
                                       SkIntToScalar(kBitmapSize));
             canvas.drawRect(r, paint);
         }
     }
 }
 
 static void test_crop_rects(SkBaseDevice* device, skiatest::Reporter* reporter) {
     // Check that all filters offset to their absolute crop rect,
     // unaffected by the input crop rect.
     // Tests pass by not asserting.
-    SkBitmap bitmap;
-    bitmap.allocN32Pixels(100, 100);
-    bitmap.eraseARGB(0, 0, 0, 0);
+    SkAutoTUnref<SkImage> image;
+    {
+        SkBitmap bitmap;
+        bitmap.allocN32Pixels(100, 100);
+        bitmap.eraseARGB(0, 0, 0, 0);
+        image.reset(SkNewImageFromBitmap(bitmap, NULL));
+        REPORTER_ASSERT(reporter, image != NULL);
+    }
     SkDeviceImageFilterProxy proxy(device, SkSurfaceProps(SkSurfaceProps::kLegacyFontHost_InitType));
 
     SkImageFilter::CropRect inputCropRect(SkRect::MakeXYWH(8, 13, 80, 80));
     SkImageFilter::CropRect cropRect(SkRect::MakeXYWH(20, 30, 60, 60));
     SkAutoTUnref<SkImageFilter> input(make_grayscale(NULL, &inputCropRect));
 
     SkAutoTUnref<SkColorFilter> cf(SkColorFilter::CreateModeFilter(SK_ColorRED, SkXfermode::kSrcIn_Mode));
     SkPoint3 location(0, 0, SK_Scalar1);
     SkPoint3 target(SK_Scalar1, SK_Scalar1, SK_Scalar1);
     SkScalar kernel[9] = {
@@ skipping 20 matching lines @@
         SkOffsetImageFilter::Create(SK_Scalar1, SK_Scalar1, input.get(), &cropRect),
         SkOffsetImageFilter::Create(SK_Scalar1, SK_Scalar1, input.get(), &cropRect),
         SkDilateImageFilter::Create(3, 2, input.get(), &cropRect),
         SkErodeImageFilter::Create(2, 3, input.get(), &cropRect),
         SkTileImageFilter::Create(inputCropRect.rect(), cropRect.rect(), input.get()),
         SkXfermodeImageFilter::Create(SkXfermode::Create(SkXfermode::kSrcOver_Mode), input.get(), input.get(), &cropRect),
     };
 
     for (size_t i = 0; i < SK_ARRAY_COUNT(filters); ++i) {
         SkImageFilter* filter = filters[i];
-        SkBitmap result;
+        SkAutoTUnref<const SkImage> result;
         SkIPoint offset;
         SkString str;
         str.printf("filter %d", static_cast<int>(i));
         SkImageFilter::Context ctx(SkMatrix::I(), SkIRect::MakeLargest(), NULL);
-        REPORTER_ASSERT_MESSAGE(reporter, filter->filterImage(&proxy, bitmap, ctx,
-                                &result, &offset), str.c_str());
+        REPORTER_ASSERT_MESSAGE(reporter, filter->filterImage(&proxy, image, ctx,
+                                result, &offset), str.c_str());
         REPORTER_ASSERT_MESSAGE(reporter, offset.fX == 20 && offset.fY == 30, str.c_str());
     }
 
     for (size_t i = 0; i < SK_ARRAY_COUNT(filters); ++i) {
         SkSafeUnref(filters[i]);
     }
 }
 
 static SkBitmap make_gradient_circle(int width, int height) {
     SkBitmap bitmap;
     SkScalar x = SkIntToScalar(width / 2);
     SkScalar y = SkIntToScalar(height / 2);
     SkScalar radius = SkMinScalar(x, y) * 0.8f;
     bitmap.allocN32Pixels(width, height);
     SkCanvas canvas(bitmap);
     canvas.clear(0x00000000);
     SkColor colors[2];
     colors[0] = SK_ColorWHITE;
     colors[1] = SK_ColorBLACK;
     SkAutoTUnref<SkShader> shader(
         SkGradientShader::CreateRadial(SkPoint::Make(x, y), radius, colors, NULL, 2,
                                        SkShader::kClamp_TileMode)
     );
     SkPaint paint;
     paint.setShader(shader);
     canvas.drawCircle(x, y, radius, paint);
     return bitmap;
 }
 
+
 static void test_negative_blur_sigma(SkBaseDevice* device, skiatest::Reporter* reporter) {
     // Check that SkBlurImageFilter will accept a negative sigma, either in
     // the given arguments or after CTM application.
     int width = 32, height = 32;
     SkDeviceImageFilterProxy proxy(device, SkSurfaceProps(SkSurfaceProps::kLegacyFontHost_InitType));
     SkScalar five = SkIntToScalar(5);
 
     SkAutoTUnref<SkBlurImageFilter> positiveFilter(
         SkBlurImageFilter::Create(five, five)
     );
 
     SkAutoTUnref<SkBlurImageFilter> negativeFilter(
         SkBlurImageFilter::Create(-five, five)
     );
 
-    SkBitmap gradient = make_gradient_circle(width, height);
     SkBitmap positiveResult1, negativeResult1;
     SkBitmap positiveResult2, negativeResult2;
-    SkIPoint offset;
-    SkImageFilter::Context ctx(SkMatrix::I(), SkIRect::MakeLargest(), NULL);
-    positiveFilter->filterImage(&proxy, gradient, ctx, &positiveResult1, &offset);
-    negativeFilter->filterImage(&proxy, gradient, ctx, &negativeResult1, &offset);
-    SkMatrix negativeScale;
-    negativeScale.setScale(-SK_Scalar1, SK_Scalar1);
-    SkImageFilter::Context negativeCTX(negativeScale, SkIRect::MakeLargest(), NULL);
-    positiveFilter->filterImage(&proxy, gradient, negativeCTX, &negativeResult2, &offset);
-    negativeFilter->filterImage(&proxy, gradient, negativeCTX, &positiveResult2, &offset);
+    {
+        SkAutoTUnref<SkImage> gradient(
+            SkNewImageFromBitmap(make_gradient_circle(width, height), NULL));
+        SkAutoTUnref<const SkImage> positiveResult1i, negativeResult1i;
+        SkAutoTUnref<const SkImage> positiveResult2i, negativeResult2i;
+        SkIPoint offset;
+        SkImageFilter::Context ctx(SkMatrix::I(), SkIRect::MakeLargest(), NULL);
+        positiveFilter->filterImage(&proxy, gradient, ctx, positiveResult1i, &offset);
+        negativeFilter->filterImage(&proxy, gradient, ctx, negativeResult1i, &offset);
+        SkMatrix negativeScale;
+        negativeScale.setScale(-SK_Scalar1, SK_Scalar1);
+        SkImageFilter::Context negativeCTX(negativeScale, SkIRect::MakeLargest(), NULL);
+        positiveFilter->filterImage(&proxy, gradient, negativeCTX, negativeResult2i, &offset);
+        negativeFilter->filterImage(&proxy, gradient, negativeCTX, positiveResult2i, &offset);
+        REPORTER_ASSERT(reporter, as_IB(positiveResult1i)->getROPixels(&positiveResult1));
+        REPORTER_ASSERT(reporter, as_IB(positiveResult2i)->getROPixels(&positiveResult2));
+        REPORTER_ASSERT(reporter, as_IB(negativeResult1i)->getROPixels(&negativeResult1));
+        REPORTER_ASSERT(reporter, as_IB(negativeResult2i)->getROPixels(&negativeResult2));
+    }
+
     SkAutoLockPixels lockP1(positiveResult1);
     SkAutoLockPixels lockP2(positiveResult2);
     SkAutoLockPixels lockN1(negativeResult1);
     SkAutoLockPixels lockN2(negativeResult2);
     for (int y = 0; y < height; y++) {
         int diffs = memcmp(positiveResult1.getAddr32(0, y), negativeResult1.getAddr32(0, y), positiveResult1.rowBytes());
         REPORTER_ASSERT(reporter, !diffs);
         if (diffs) {
             break;
         }
@@ skipping 479 matching lines @@
 
     // Create an SkPicture which simply draws a green 1x1 rectangle.
     SkPaint greenPaint;
     greenPaint.setColor(SK_ColorGREEN);
     recordingCanvas->drawRect(SkRect::Make(SkIRect::MakeWH(1, 1)), greenPaint);
     SkAutoTUnref<SkPicture> picture(recorder.endRecording());
 
     SkAutoTUnref<SkImageFilter> imageFilter(
         SkPictureImageFilter::Create(picture.get()));
 
-    SkBitmap result;
+    SkAutoTUnref<const SkImage> result;
     SkIPoint offset;
     SkImageFilter::Context ctx(SkMatrix::I(), SkIRect::MakeXYWH(1, 1, 1, 1), NULL);
+    SkAutoTUnref<const SkImage> image;
     SkBitmap bitmap;
     bitmap.allocN32Pixels(2, 2);
+    image.reset(SkNewImageFromBitmap(bitmap, NULL));
     SkBitmapDevice device(bitmap);
     SkDeviceImageFilterProxy proxy(&device, SkSurfaceProps(SkSurfaceProps::kLegacyFontHost_InitType));
-    REPORTER_ASSERT(reporter, !imageFilter->filterImage(&proxy, bitmap, ctx, &result, &offset));
+    REPORTER_ASSERT(reporter, !imageFilter->filterImage(&proxy, image, ctx, result, &offset));
 }
 
 DEF_TEST(ImageFilterEmptySaveLayer, reporter) {
     // Even when there's an empty saveLayer()/restore(), ensure that an image
     // filter or color filter which affects transparent black still draws.
 
     SkBitmap bitmap;
     bitmap.allocN32Pixels(10, 10);
     SkBitmapDevice device(bitmap);
     SkCanvas canvas(&device);
@@ skipping 222 matching lines @@
     SkBitmapDevice device(temp);
     test_xfermode_cropped_input(&device, reporter);
 }
 
 DEF_TEST(ComposedImageFilterOffset, reporter) {
     SkBitmap bitmap;
     bitmap.allocN32Pixels(100, 100);
     bitmap.eraseARGB(0, 0, 0, 0);
     SkBitmapDevice device(bitmap);
     SkDeviceImageFilterProxy proxy(&device, SkSurfaceProps(SkSurfaceProps::kLegacyFontHost_InitType));
-
+    SkAutoTUnref<const SkImage> image(SkNewImageFromBitmap(bitmap, NULL));
     SkImageFilter::CropRect cropRect(SkRect::MakeXYWH(1, 0, 20, 20));
     SkAutoTUnref<SkImageFilter> offsetFilter(SkOffsetImageFilter::Create(0, 0, NULL, &cropRect));
     SkAutoTUnref<SkImageFilter> blurFilter(makeBlur());
     SkAutoTUnref<SkImageFilter> composedFilter(SkComposeImageFilter::Create(blurFilter, offsetFilter.get()));
-    SkBitmap result;
+    SkAutoTUnref<const SkImage> result;
     SkIPoint offset;
     SkImageFilter::Context ctx(SkMatrix::I(), SkIRect::MakeLargest(), NULL);
-    REPORTER_ASSERT(reporter, composedFilter->filterImage(&proxy, bitmap, ctx, &result, &offset));
+    REPORTER_ASSERT(reporter, composedFilter->filterImage(&proxy, image, ctx, result, &offset));
     REPORTER_ASSERT(reporter, offset.fX == 1 && offset.fY == 0);
 }
 
 #if SK_SUPPORT_GPU
 const SkSurfaceProps gProps = SkSurfaceProps(SkSurfaceProps::kLegacyFontHost_InitType);
 
 DEF_GPUTEST(ImageFilterCropRectGPU, reporter, factory) {
     GrContext* context = factory->get(static_cast<GrContextFactory::GLContextType>(0));
     SkAutoTUnref<SkGpuDevice> device(SkGpuDevice::Create(context,
                                                          SkSurface::kNo_Budgeted,
@@ skipping 26 matching lines @@
 DEF_GPUTEST(TestNegativeBlurSigmaGPU, reporter, factory) {
     GrContext* context = factory->get(static_cast<GrContextFactory::GLContextType>(0));
     SkAutoTUnref<SkGpuDevice> device(SkGpuDevice::Create(context,
                                                          SkSurface::kNo_Budgeted,
                                                          SkImageInfo::MakeN32Premul(1, 1),
                                                          0,
                                                          &gProps));
     test_negative_blur_sigma(device, reporter);
 }
 #endif