Make filters use SkImage instead of SkBitmap

src/effects/SkComposeImageFilter.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 "SkComposeImageFilter.h"
 #include "SkReadBuffer.h"
 #include "SkWriteBuffer.h"
 
 SkComposeImageFilter::~SkComposeImageFilter() {
 }
 
 void SkComposeImageFilter::computeFastBounds(const SkRect& src, SkRect* dst) const {
     SkImageFilter* outer = getInput(0);
     SkImageFilter* inner = getInput(1);
 
     SkRect tmp;
     inner->computeFastBounds(src, &tmp);
     outer->computeFastBounds(tmp, dst);
 }
 
 bool SkComposeImageFilter::onFilterImage(Proxy* proxy,
-                                         const SkBitmap& src,
+                                         const SkImage* src,
                                          const Context& ctx,
-                                         SkBitmap* result,
+                                         SkAutoTUnref<const SkImage>& result,
                                          SkIPoint* offset) const {
     SkImageFilter* outer = getInput(0);
     SkImageFilter* inner = getInput(1);
 
-    SkBitmap tmp;
+    SkAutoTUnref<const SkImage> tmp;
     SkIPoint innerOffset = SkIPoint::Make(0, 0);
     SkIPoint outerOffset = SkIPoint::Make(0, 0);
-    if (!inner->filterImage(proxy, src, ctx, &tmp, &innerOffset))
+    if (!inner->filterImage(proxy, src, ctx, tmp, &innerOffset))
         return false;
 
     SkMatrix outerMatrix(ctx.ctm());
     outerMatrix.postTranslate(SkIntToScalar(-innerOffset.x()), SkIntToScalar(-innerOffset.y()));
     Context outerContext(outerMatrix, ctx.clipBounds(), ctx.cache());
     if (!outer->filterImage(proxy, tmp, outerContext, result, &outerOffset)) {
         return false;
     }
 
     *offset = innerOffset + outerOffset;
@@ skipping 24 matching lines @@
 
     str->appendf("outer: ");
     outer->toString(str);
 
     str->appendf("inner: ");
     inner->toString(str);
 
     str->appendf(")");
 }
 #endif