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() {
 }
 
 bool SkComposeImageFilter::onFilterImage(Proxy* proxy,
-                                         const SkBitmap& src,
+                                         SkImage& src,
                                          const Context& ctx,
-                                         SkBitmap* result,
+                                         SkAutoTUnref<SkImage>& result,
                                          SkIPoint* offset) const {
     SkImageFilter* outer = getInput(0);
     SkImageFilter* inner = getInput(1);
 
-    SkBitmap tmp;
-    return inner->filterImage(proxy, src, ctx, &tmp, offset) &&
-           outer->filterImage(proxy, tmp, ctx, result, offset);
+    SkAutoTUnref<SkImage> tmp;
+    return inner->filterImage(proxy, src, ctx, tmp, offset) &&
+           outer->filterImage(proxy, *tmp, ctx, result, offset);
 }
 
 bool SkComposeImageFilter::onFilterBounds(const SkIRect& src,
                                           const SkMatrix& ctm,
                                           SkIRect* dst) const {
     SkImageFilter* outer = getInput(0);
     SkImageFilter* inner = getInput(1);
 
     SkIRect tmp;
     return inner->filterBounds(src, ctm, &tmp) && outer->filterBounds(tmp, ctm, dst);
@@ skipping 13 matching lines @@
 
     str->appendf("outer: ");
     outer->toString(str);
 
     str->appendf("inner: ");
     inner->toString(str);
 
     str->appendf(")");
 }
 #endif