Make filters use SkImage instead of SkBitmap

src/effects/SkBlurImageFilter.cpp

 /*
  * Copyright 2011 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 "SkBitmap.h"
 #include "SkBlurImageFilter.h"
 #include "SkColorPriv.h"
+#include "SkImage_Base.h"
+#include "SkImagePriv.h"
 #include "SkReadBuffer.h"
 #include "SkWriteBuffer.h"
 #include "SkGpuBlurUtils.h"
 #include "SkBlurImage_opts.h"
 #if SK_SUPPORT_GPU
 #include "GrContext.h"
 #endif
 
 // This rather arbitrary-looking value results in a maximum box blur kernel size
 // of 1000 pixels on the raster path, which matches the WebKit and Firefox
@@ skipping 118 matching lines @@
         *lowOffset = *highOffset = (d - 1) / 2;
         *kernelSize3 = d;
     } else {
         *highOffset = d / 2;
         *lowOffset = *highOffset - 1;
         *kernelSize3 = d + 1;
     }
 }
 
 bool SkBlurImageFilter::onFilterImage(Proxy* proxy,
-                                      const SkBitmap& source, const Context& ctx,
-                                      SkBitmap* dst, SkIPoint* offset) const {
-    SkBitmap src = source;
+                                      SkImage& source, const Context& ctx,
+                                      SkAutoTUnref<SkImage>& dst, SkIPoint* offset) const {
+    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 (src.colorType() != kN32_SkColorType) {
+#if 0 //TODO: colortype
+    if (src->colorType() != kN32_SkColorType) {
+        return false;
+    }
+#endif
+
+    SkIRect srcBounds, dstBounds;
+    if (!this->applyCropRect(ctx, proxy, *src, &srcOffset, &srcBounds, src)) {
         return false;
     }
 
-    SkIRect srcBounds, dstBounds;
-    if (!this->applyCropRect(ctx, proxy, src, &srcOffset, &srcBounds, &src)) {
+    SkBitmap srcBitmap;
+    if (!as_IB(src)->getROPixels(&srcBitmap)) {
+        return false;
+    }
+    src.reset(NULL);
+
+    SkAutoLockPixels alp(srcBitmap);
+    if (!srcBitmap.getPixels()) {
         return false;
     }
 
-    SkAutoLockPixels alp(src);
-    if (!src.getPixels()) {
+    SkBitmap dstBitmap;
+    if (!dstBitmap.tryAllocPixels(
+            srcBitmap.info().makeWH(srcBounds.width(), srcBounds.height()))) {
         return false;
     }
-
-    if (!dst->tryAllocPixels(src.info().makeWH(srcBounds.width(), srcBounds.height()))) {
-        return false;
-    }
-    dst->getBounds(&dstBounds);
+    dstBitmap.getBounds(&dstBounds);
 
     SkVector sigma = mapSigma(fSigma, ctx.ctm());
 
     int kernelSizeX, kernelSizeX3, lowOffsetX, highOffsetX;
     int kernelSizeY, kernelSizeY3, lowOffsetY, highOffsetY;
     getBox3Params(sigma.x(), &kernelSizeX, &kernelSizeX3, &lowOffsetX, &highOffsetX);
     getBox3Params(sigma.y(), &kernelSizeY, &kernelSizeY3, &lowOffsetY, &highOffsetY);
 
     if (kernelSizeX < 0 || kernelSizeY < 0) {
         return false;
     }
 
     if (kernelSizeX == 0 && kernelSizeY == 0) {
-        src.copyTo(dst, dst->colorType());
+        srcBitmap.copyTo(&dstBitmap, dstBitmap.colorType());
         offset->fX = srcBounds.fLeft;
         offset->fY = srcBounds.fTop;
         return true;
     }
 
     SkBitmap temp;
-    if (!temp.tryAllocPixels(dst->info())) {
+    if (!temp.tryAllocPixels(dstBitmap.info())) {
         return false;
     }
 
-    offset->fX = srcBounds.fLeft;
-    offset->fY = srcBounds.fTop;
+    int32_t resultX = srcBounds.fLeft;
+    int32_t resultY = srcBounds.fTop;
     srcBounds.offset(-srcOffset);
-    const SkPMColor* s = src.getAddr32(srcBounds.left(), srcBounds.top());
+    const SkPMColor* s = srcBitmap.getAddr32(srcBounds.left(), srcBounds.top());
     SkPMColor* t = temp.getAddr32(0, 0);
-    SkPMColor* d = dst->getAddr32(0, 0);
+    SkPMColor* d = dstBitmap.getAddr32(0, 0);
     int w = dstBounds.width(), h = dstBounds.height();
-    int sw = src.rowBytesAsPixels();
+    int sw = srcBitmap.rowBytesAsPixels();
     SkBoxBlurProc boxBlurX, boxBlurY, boxBlurXY, boxBlurYX;
     if (!SkBoxBlurGetPlatformProcs(&boxBlurX, &boxBlurY, &boxBlurXY, &boxBlurYX)) {
         boxBlurX = boxBlur<kX, kX>;
         boxBlurY = boxBlur<kY, kY>;
         boxBlurXY = boxBlur<kX, kY>;
         boxBlurYX = boxBlur<kY, kX>;
     }
 
     if (kernelSizeX > 0 && kernelSizeY > 0) {
         boxBlurX(s,  sw, t, kernelSizeX,  lowOffsetX,  highOffsetX, w, h);
         boxBlurX(t,  w,  d, kernelSizeX,  highOffsetX, lowOffsetX,  w, h);
         boxBlurXY(d, w,  t, kernelSizeX3, highOffsetX, highOffsetX, w, h);
         boxBlurX(t,  h,  d, kernelSizeY,  lowOffsetY,  highOffsetY, h, w);
         boxBlurX(d,  h,  t, kernelSizeY,  highOffsetY, lowOffsetY,  h, w);
         boxBlurXY(t, h,  d, kernelSizeY3, highOffsetY, highOffsetY, h, w);
     } else if (kernelSizeX > 0) {
         boxBlurX(s,  sw, d, kernelSizeX,  lowOffsetX,  highOffsetX, w, h);
         boxBlurX(d,  w,  t, kernelSizeX,  highOffsetX, lowOffsetX,  w, h);
         boxBlurX(t,  w,  d, kernelSizeX3, highOffsetX, highOffsetX, w, h);
     } else if (kernelSizeY > 0) {
         boxBlurYX(s, sw, d, kernelSizeY,  lowOffsetY,  highOffsetY, h, w);
         boxBlurX(d,  h,  t, kernelSizeY,  highOffsetY, lowOffsetY,  h, w);
         boxBlurXY(t, h,  d, kernelSizeY3, highOffsetY, highOffsetY, h, w);
     }
+    temp = SkBitmap();
+    SkImage* image = SkNewImageFromBitmap(dstBitmap, true, NULL);
+    if (NULL == image) {
+        return false;
+    }
+    dst.reset(image);
+    offset->fX = resultX;
+    offset->fY = resultY;
     return true;
 }
 
 
 void SkBlurImageFilter::computeFastBounds(const SkRect& src, SkRect* dst) const {
     if (getInput(0)) {
         getInput(0)->computeFastBounds(src, dst);
     } else {
         *dst = src;
     }
 
     dst->outset(SkScalarMul(fSigma.width(), SkIntToScalar(3)),
                 SkScalarMul(fSigma.height(), SkIntToScalar(3)));
 }
 
 bool SkBlurImageFilter::onFilterBounds(const SkIRect& src, const SkMatrix& ctm,
                                        SkIRect* dst) const {
     SkIRect bounds = src;
     SkVector sigma = mapSigma(fSigma, ctm);
     bounds.outset(SkScalarCeilToInt(SkScalarMul(sigma.x(), SkIntToScalar(3))),
                   SkScalarCeilToInt(SkScalarMul(sigma.y(), SkIntToScalar(3))));
     if (getInput(0) && !getInput(0)->filterBounds(bounds, ctm, &bounds)) {
         return false;
     }
     *dst = bounds;
     return true;
 }
 
-bool SkBlurImageFilter::filterImageGPU(Proxy* proxy, const SkBitmap& src, const Context& ctx,
-                                       SkBitmap* result, SkIPoint* offset) const {
+bool SkBlurImageFilter::filterImageGPU(Proxy* proxy, SkImage& src, const Context& ctx,
+                                       SkAutoTUnref<SkImage>& result, SkIPoint* offset) const {
 #if SK_SUPPORT_GPU
-    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 rect;
-    if (!this->applyCropRect(ctx, proxy, input, &srcOffset, &rect, &input)) {
+    if (!this->applyCropRect(ctx, proxy, *input, &srcOffset, &rect, input)) {
         return false;
     }
-    GrTexture* source = input.getTexture();
+    GrTexture* source = input->getTexture();
     SkVector sigma = mapSigma(fSigma, ctx.ctm());
     offset->fX = rect.fLeft;
     offset->fY = rect.fTop;
     rect.offset(-srcOffset);
     SkAutoTUnref<GrTexture> tex(SkGpuBlurUtils::GaussianBlur(source->getContext(),
                                                              source,
                                                              false,
                                                              SkRect::Make(rect),
                                                              true,
                                                              sigma.x(),
                                                              sigma.y()));
-    WrapTexture(tex, rect.width(), rect.height(), result);
+    if (!WrapTexture(tex, rect.width(), rect.height(), result)) {
+        return false;
+    }
     return true;
 #else
     SkDEBUGFAIL("Should not call in GPU-less build");
     return false;
 #endif
 }
 
 #ifndef SK_IGNORE_TO_STRING
 void SkBlurImageFilter::toString(SkString* str) const {
     str->appendf("SkBlurImageFilter: (");
     str->appendf("sigma: (%f, %f) input (", fSigma.fWidth, fSigma.fHeight);
 
     if (this->getInput(0)) {
         this->getInput(0)->toString(str);
     }
 
     str->append("))");
 }
 #endif