Change signatures of filter bounds methods to return a rect.

src/core/SkMatrixImageFilter.cpp

 /*
  * Copyright 2014 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 "SkMatrixImageFilter.h"
 #include "SkBitmap.h"
 #include "SkCanvas.h"
@@ skipping 73 matching lines @@
     paint.setXfermodeMode(SkXfermode::kSrc_Mode);
     paint.setFilterQuality(fFilterQuality);
     canvas.drawBitmap(src, srcRect.x(), srcRect.y(), &paint);
 
     *result = device.get()->accessBitmap(false);
     offset->fX = dstBounds.fLeft;
     offset->fY = dstBounds.fTop;
     return true;
 }
 
-void SkMatrixImageFilter::computeFastBounds(const SkRect& src, SkRect* dst) const {
-    SkRect bounds = src;
-    if (getInput(0)) {
-        getInput(0)->computeFastBounds(src, &bounds);
-    }
-    fTransform.mapRect(dst, bounds);
+SkRect SkMatrixImageFilter::computeFastBounds(const SkRect& src) const {
+    SkRect bounds = this->getInput(0) ? this->getInput(0)->computeFastBounds(src) : src;
+    SkRect dst;
+    fTransform.mapRect(&dst, bounds);
+    return dst;
 }
 
-void SkMatrixImageFilter::onFilterNodeBounds(const SkIRect& src, const SkMatrix& ctm,
-                                             SkIRect* dst, MapDirection direction) const {
+SkIRect SkMatrixImageFilter::onFilterNodeBounds(const SkIRect& src, const SkMatrix& ctm,
+                                                MapDirection direction) const {
     SkMatrix matrix;
     if (!ctm.invert(&matrix)) {
-        *dst = src;
-        return;
+        return src;
     }
     if (kForward_MapDirection == direction) {
         matrix.postConcat(fTransform);
     } else {
         SkMatrix transformInverse;
         if (!fTransform.invert(&transformInverse)) {
-            *dst = src;
-            return;
+            return src;
         }
         matrix.postConcat(transformInverse);
     }
     matrix.postConcat(ctm);
     SkRect floatBounds;
     matrix.mapRect(&floatBounds, SkRect::Make(src));
-    SkIRect bounds = floatBounds.roundOut();
-    *dst = bounds;
+    return floatBounds.roundOut();
 }
 
 #ifndef SK_IGNORE_TO_STRING
 void SkMatrixImageFilter::toString(SkString* str) const {
     str->appendf("SkMatrixImageFilter: (");
 
     str->appendf("transform: (%f %f %f %f %f %f %f %f %f)",
                  fTransform[SkMatrix::kMScaleX],
                  fTransform[SkMatrix::kMSkewX],
                  fTransform[SkMatrix::kMTransX],
                  fTransform[SkMatrix::kMSkewY],
                  fTransform[SkMatrix::kMScaleY],
                  fTransform[SkMatrix::kMTransY],
                  fTransform[SkMatrix::kMPersp0],
                  fTransform[SkMatrix::kMPersp1],
                  fTransform[SkMatrix::kMPersp2]);
 
     str->append("<dt>FilterLevel:</dt><dd>");
     static const char* gFilterLevelStrings[] = { "None", "Low", "Medium", "High" };
     str->append(gFilterLevelStrings[fFilterQuality]);
     str->append("</dd>");
 
     str->appendf(")");
 }
 #endif