Make filters use SkImage instead of SkBitmap

src/effects/SkMorphologyImageFilter.cpp

 /*
  * Copyright 2012 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkMorphologyImageFilter.h"
 #include "SkBitmap.h"
 #include "SkColorPriv.h"
+#include "SkImage.h"
+#include "SkImagePriv.h"
+#include "SkImage_Base.h"
 #include "SkReadBuffer.h"
 #include "SkWriteBuffer.h"
 #include "SkRect.h"
 #include "SkMorphology_opts.h"
 #if SK_SUPPORT_GPU
 #include "GrContext.h"
 #include "GrInvariantOutput.h"
 #include "GrTexture.h"
 #include "effects/Gr1DKernelEffect.h"
 #include "gl/GrGLProcessor.h"
@@ skipping 104 matching lines @@
 static void callProcY(SkMorphologyImageFilter::Proc procY, const SkBitmap& src, SkBitmap* dst, int radiusY, const SkIRect& bounds)
 {
     procY(src.getAddr32(bounds.left(), bounds.top()), dst->getAddr32(0, 0),
           radiusY, bounds.height(), bounds.width(),
           src.rowBytesAsPixels(), dst->rowBytesAsPixels());
 }
 
 bool SkMorphologyImageFilter::filterImageGeneric(SkMorphologyImageFilter::Proc procX,
                                                  SkMorphologyImageFilter::Proc procY,
                                                  Proxy* proxy,
-                                                 const SkBitmap& source,
+                                                 SkImage& source,
                                                  const Context& ctx,
-                                                 SkBitmap* dst,
+                                                 SkAutoTUnref<SkImage>& dst,
                                                  SkIPoint* offset) const {
-    SkBitmap src = source;
+    SkAutoTUnref<SkImage> src(SkRef(&source));
     SkIPoint srcOffset = SkIPoint::Make(0, 0);
-    if (getInput(0) && !getInput(0)->filterImage(proxy, source, ctx, &src, &srcOffset)) {
+    if (getInput(0) && !getInput(0)->filterImage(proxy, source, ctx, src, &srcOffset)) {
+        return false;
+    }
+#if 0
+    if (src.colorType() != kN32_SkColorType) {
+        return false;
+    }
+#endif
+    SkIRect bounds;
+    if (!this->applyCropRect(ctx, proxy, *src, &srcOffset, &bounds, src)) {
         return false;
     }
 
-    if (src.colorType() != kN32_SkColorType) {
+    SkBitmap srcBitmap;
+    if (!as_IB(src)->getROPixels(&srcBitmap)) {
+        return false;
+    }
+    src.reset(NULL);
+    SkAutoLockPixels alp(srcBitmap);
+    if (!srcBitmap.getPixels()) {
         return false;
     }
 
-    SkIRect bounds;
-    if (!this->applyCropRect(ctx, proxy, src, &srcOffset, &bounds, &src)) {
+    SkBitmap dstBitmap;
+    if (!dstBitmap.tryAllocPixels(srcBitmap.info().makeWH(bounds.width(), bounds.height()))) {
         return false;
     }
 
-    SkAutoLockPixels alp(src);
-    if (!src.getPixels()) {
-        return false;
-    }
-
-    if (!dst->tryAllocPixels(src.info().makeWH(bounds.width(), bounds.height()))) {
-        return false;
-    }
-
     SkVector radius = SkVector::Make(SkIntToScalar(this->radius().width()),
                                      SkIntToScalar(this->radius().height()));
     ctx.ctm().mapVectors(&radius, 1);
     int width = SkScalarFloorToInt(radius.fX);
     int height = SkScalarFloorToInt(radius.fY);
 
     if (width < 0 || height < 0) {
         return false;
     }
 
     SkIRect srcBounds = bounds;
     srcBounds.offset(-srcOffset);
 
     if (width == 0 && height == 0) {
-        src.extractSubset(dst, srcBounds);
+        srcBitmap.extractSubset(&dstBitmap, srcBounds);
+        SkImage* image = SkNewImageFromBitmap(dstBitmap, true, NULL);
+        if (NULL == image) {
+            return false;
+        }
+        dst.reset(image);
         offset->fX = bounds.left();
         offset->fY = bounds.top();
         return true;
     }
 
     SkBitmap temp;
-    if (!temp.tryAllocPixels(dst->info())) {
+    if (!temp.tryAllocPixels(dstBitmap.info())) {
         return false;
     }
 
     if (width > 0 && height > 0) {
-        callProcX(procX, src, &temp, width, srcBounds);
+        callProcX(procX, srcBitmap, &temp, width, srcBounds);
         SkIRect tmpBounds = SkIRect::MakeWH(srcBounds.width(), srcBounds.height());
-        callProcY(procY, temp, dst, height, tmpBounds);
+        callProcY(procY, temp, &dstBitmap, height, tmpBounds);
     } else if (width > 0) {
-        callProcX(procX, src, dst, width, srcBounds);
+        callProcX(procX, srcBitmap, &dstBitmap, width, srcBounds);
     } else if (height > 0) {
-        callProcY(procY, src, dst, height, srcBounds);
+        callProcY(procY, srcBitmap, &dstBitmap, height, srcBounds);
     }
+
+    srcBitmap = SkBitmap();
+    temp = SkBitmap();
+
+    SkImage* image = SkNewImageFromBitmap(dstBitmap, true, NULL);
+    if (NULL == image) {
+        return false;
+    }
+    dst.reset(image);
     offset->fX = bounds.left();
     offset->fY = bounds.top();
     return true;
 }
 
 bool SkErodeImageFilter::onFilterImage(Proxy* proxy,
-                                       const SkBitmap& source, const Context& ctx,
-                                       SkBitmap* dst, SkIPoint* offset) const {
+                                       SkImage& source, const Context& ctx,
+                                       SkAutoTUnref<SkImage>& dst, SkIPoint* offset) const {
     Proc erodeXProc = SkMorphologyGetPlatformProc(kErodeX_SkMorphologyProcType);
     if (!erodeXProc) {
         erodeXProc = erode<kX>;
     }
     Proc erodeYProc = SkMorphologyGetPlatformProc(kErodeY_SkMorphologyProcType);
     if (!erodeYProc) {
         erodeYProc = erode<kY>;
     }
     return this->filterImageGeneric(erodeXProc, erodeYProc, proxy, source, ctx, dst, offset);
 }
 
 bool SkDilateImageFilter::onFilterImage(Proxy* proxy,
-                                        const SkBitmap& source, const Context& ctx,
-                                        SkBitmap* dst, SkIPoint* offset) const {
+                                        SkImage& source, const Context& ctx,
+                                        SkAutoTUnref<SkImage>& dst, SkIPoint* offset) const {
     Proc dilateXProc = SkMorphologyGetPlatformProc(kDilateX_SkMorphologyProcType);
     if (!dilateXProc) {
         dilateXProc = dilate<kX>;
     }
     Proc dilateYProc = SkMorphologyGetPlatformProc(kDilateY_SkMorphologyProcType);
     if (!dilateYProc) {
         dilateYProc = dilate<kY>;
     }
     return this->filterImageGeneric(dilateXProc, dilateYProc, proxy, source, ctx, dst, offset);
 }
@@ skipping 404 matching lines @@
         // Draw upper and lower margins with bounds; middle without.
         apply_morphology_rect(context, texture, lowerSrcRect, lowerDstRect, radius,
                               morphType, bounds, direction);
         apply_morphology_rect(context, texture, upperSrcRect, upperDstRect, radius,
                               morphType, bounds, direction);
         apply_morphology_rect_no_bounds(context, texture, middleSrcRect, middleDstRect, radius,
                               morphType, direction);
     }
 }
 
-bool apply_morphology(const SkBitmap& input,
+bool apply_morphology(SkImage& input,
                       const SkIRect& rect,
                       GrMorphologyEffect::MorphologyType morphType,
                       SkISize radius,
-                      SkBitmap* dst) {
+                      SkAutoTUnref<SkImage>& dst) {
     SkAutoTUnref<GrTexture> srcTexture(SkRef(input.getTexture()));
     SkASSERT(srcTexture);
     GrContext* context = srcTexture->getContext();
 
     GrContext::AutoClip acs(context, SkRect::MakeWH(SkIntToScalar(srcTexture->width()),
                                                     SkIntToScalar(srcTexture->height())));
 
     SkIRect dstRect = SkIRect::MakeWH(rect.width(), rect.height());
     GrSurfaceDesc desc;
     desc.fFlags = kRenderTarget_GrSurfaceFlag | kNoStencil_GrSurfaceFlag;
@@ skipping 22 matching lines @@
     if (radius.fHeight > 0) {
         GrTexture* texture = context->refScratchTexture(desc, GrContext::kApprox_ScratchTexMatch);
         if (NULL == texture) {
             return false;
         }
         GrContext::AutoRenderTarget art(context, texture->asRenderTarget());
         apply_morphology_pass(context, srcTexture, srcRect, dstRect, radius.fHeight,
                               morphType, Gr1DKernelEffect::kY_Direction);
         srcTexture.reset(texture);
     }
-    SkImageFilter::WrapTexture(srcTexture, rect.width(), rect.height(), dst);
+    if (!SkImageFilter::WrapTexture(srcTexture, rect.width(), rect.height(), dst)) {
+        return false;
+    }
     return true;
 }
 
 };
 
 bool SkMorphologyImageFilter::filterImageGPUGeneric(bool dilate,
                                                     Proxy* proxy,
-                                                    const SkBitmap& src,
+                                                    SkImage& src,
                                                     const Context& ctx,
-                                                    SkBitmap* result,
+                                                    SkAutoTUnref<SkImage>& result,
                                                     SkIPoint* offset) const {
-    SkBitmap input = src;
+    SkAutoTUnref<SkImage> input(SkRef(&src));
     SkIPoint srcOffset = SkIPoint::Make(0, 0);
-    if (getInput(0) && !getInput(0)->getInputResultGPU(proxy, src, ctx, &input, &srcOffset)) {
+    if (getInput(0) && !getInput(0)->getInputResultGPU(proxy, src, ctx, input, &srcOffset)) {
         return false;
     }
     SkIRect bounds;
-    if (!this->applyCropRect(ctx, proxy, input, &srcOffset, &bounds, &input)) {
+    if (!this->applyCropRect(ctx, proxy, *input, &srcOffset, &bounds, input)) {
         return false;
     }
     SkVector radius = SkVector::Make(SkIntToScalar(this->radius().width()),
                                      SkIntToScalar(this->radius().height()));
     ctx.ctm().mapVectors(&radius, 1);
     int width = SkScalarFloorToInt(radius.fX);
     int height = SkScalarFloorToInt(radius.fY);
 
     if (width < 0 || height < 0) {
         return false;
     }
 
     SkIRect srcBounds = bounds;
     srcBounds.offset(-srcOffset);
     if (width == 0 && height == 0) {
-        input.extractSubset(result, srcBounds);
+        SkImage* image = input->newImage(srcBounds.width(), srcBounds.height(), &srcBounds);
+        if (NULL == image) {
+            return false;
+        }
+        result.reset(image);
         offset->fX = bounds.left();
         offset->fY = bounds.top();
         return true;
     }
 
     GrMorphologyEffect::MorphologyType type = dilate ? GrMorphologyEffect::kDilate_MorphologyType : GrMorphologyEffect::kErode_MorphologyType;
-    if (!apply_morphology(input, srcBounds, type,
+    if (!apply_morphology(*input, srcBounds, type,
                           SkISize::Make(width, height), result)) {
         return false;
     }
     offset->fX = bounds.left();
     offset->fY = bounds.top();
     return true;
 }
 
-bool SkDilateImageFilter::filterImageGPU(Proxy* proxy, const SkBitmap& src, const Context& ctx,
-                                         SkBitmap* result, SkIPoint* offset) const {
+bool SkDilateImageFilter::filterImageGPU(Proxy* proxy, SkImage& src, const Context& ctx,
+                                         SkAutoTUnref<SkImage>& result, SkIPoint* offset) const {
     return this->filterImageGPUGeneric(true, proxy, src, ctx, result, offset);
 }
 
-bool SkErodeImageFilter::filterImageGPU(Proxy* proxy, const SkBitmap& src, const Context& ctx,
-                                        SkBitmap* result, SkIPoint* offset) const {
+bool SkErodeImageFilter::filterImageGPU(Proxy* proxy, SkImage& src, const Context& ctx,
+                                        SkAutoTUnref<SkImage>& result, SkIPoint* offset) const {
     return this->filterImageGPUGeneric(false, proxy, src, ctx, result, offset);
 }
 
 #endif