Make filters use SkImage instead of SkBitmap

src/effects/SkDropShadowImageFilter.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 "SkDropShadowImageFilter.h"
 
 #include "SkBitmap.h"
 #include "SkBlurImageFilter.h"
 #include "SkCanvas.h"
 #include "SkColorMatrixFilter.h"
-#include "SkDevice.h"
+#include "SkSurface.h"
 #include "SkReadBuffer.h"
 #include "SkWriteBuffer.h"
 
 SkDropShadowImageFilter::SkDropShadowImageFilter(SkScalar dx, SkScalar dy,
                                                  SkScalar sigmaX, SkScalar sigmaY, SkColor color,
                                                  ShadowMode shadowMode, SkImageFilter* input,
                                                  const CropRect* cropRect, uint32_t uniqueID)
     : INHERITED(1, &input, cropRect, uniqueID)
     , fDx(dx)
     , fDy(dy)
@@ skipping 21 matching lines @@
 void SkDropShadowImageFilter::flatten(SkWriteBuffer& buffer) const {
     this->INHERITED::flatten(buffer);
     buffer.writeScalar(fDx);
     buffer.writeScalar(fDy);
     buffer.writeScalar(fSigmaX);
     buffer.writeScalar(fSigmaY);
     buffer.writeColor(fColor);
     buffer.writeInt(static_cast<int>(fShadowMode));
 }
 
-bool SkDropShadowImageFilter::onFilterImage(Proxy* proxy, const SkBitmap& source,
+bool SkDropShadowImageFilter::onFilterImage(Proxy* proxy, SkImage& source,
                                             const Context& ctx,
-                                            SkBitmap* result, SkIPoint* offset) const
+                                            SkAutoTUnref<SkImage>& result, SkIPoint* offset) const
 {
-    SkBitmap src = source;
+    SkAutoTUnref<SkImage> src(&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;
 
     SkIRect bounds;
-    if (!this->applyCropRect(ctx, src, srcOffset, &bounds)) {
+    if (!this->applyCropRect(ctx, *src, srcOffset, &bounds)) {
         return false;
     }
 
-    SkAutoTUnref<SkBaseDevice> device(proxy->createDevice(bounds.width(), bounds.height()));
-    if (NULL == device.get()) {
+    SkAutoTUnref<SkSurface> surface(proxy->createSurface(bounds.width(), bounds.height()));
+    if (NULL == surface.get()) {
         return false;
     }
-    SkCanvas canvas(device.get());
+    SkCanvas* canvas = surface->getCanvas();
 
     SkVector sigma = SkVector::Make(fSigmaX, fSigmaY);
     ctx.ctm().mapVectors(&sigma, 1);
     sigma.fX = SkMaxScalar(0, sigma.fX);
     sigma.fY = SkMaxScalar(0, sigma.fY);
     SkAutoTUnref<SkImageFilter> blurFilter(SkBlurImageFilter::Create(sigma.fX, sigma.fY));
     SkAutoTUnref<SkColorFilter> colorFilter(
         SkColorFilter::CreateModeFilter(fColor, SkXfermode::kSrcIn_Mode));
     SkPaint paint;
     paint.setImageFilter(blurFilter.get());
     paint.setColorFilter(colorFilter.get());
     paint.setXfermodeMode(SkXfermode::kSrcOver_Mode);
     SkVector offsetVec = SkVector::Make(fDx, fDy);
     ctx.ctm().mapVectors(&offsetVec, 1);
-    canvas.translate(SkIntToScalar(srcOffset.fX - bounds.fLeft),
+    canvas->translate(SkIntToScalar(srcOffset.fX - bounds.fLeft),
                      SkIntToScalar(srcOffset.fY - bounds.fTop));
-    canvas.drawBitmap(src, offsetVec.fX, offsetVec.fY, &paint);
+    canvas->drawImage(src, offsetVec.fX, offsetVec.fY, &paint);
     if (fShadowMode == kDrawShadowAndForeground_ShadowMode) {
-        canvas.drawBitmap(src, 0, 0);
+        canvas->drawImage(src, 0, 0);
     }
-    *result = device->accessBitmap(false);
+
+    SkImage* image = surface->newImageSnapshot(SkSurface::kYes_Budgeted);
+    if (NULL == image) {
+        return false;
+    }
+    result.reset(image);
+
     offset->fX = bounds.fLeft;
     offset->fY = bounds.fTop;
     return true;
 }
 
 void SkDropShadowImageFilter::computeFastBounds(const SkRect& src, SkRect* dst) const {
     if (getInput(0)) {
         getInput(0)->computeFastBounds(src, dst);
     } else {
         *dst = src;
@@ skipping 47 matching lines @@
         "kDrawShadowAndForeground", "kDrawShadowOnly"
     };
 
     SK_COMPILE_ASSERT(kShadowModeCount == SK_ARRAY_COUNT(gModeStrings), enum_mismatch);
 
     str->appendf(" mode: %s", gModeStrings[fShadowMode]);
 
     str->append(")");
 }
 #endif