Change signatures of filter bounds methods to return a rect.

tests/ImageFilterTest.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 "SkBitmapDevice.h"
@@ skipping 738 matching lines @@
         SK_ColorBLUE, SkDropShadowImageFilter::kDrawShadowAndForeground_ShadowMode,
         input, nullptr);
 }
 
 DEF_TEST(ImageFilterBlurThenShadowBounds, reporter) {
     SkAutoTUnref<SkImageFilter> filter1(makeBlur());
     SkAutoTUnref<SkImageFilter> filter2(makeDropShadow(filter1.get()));
 
     SkIRect bounds = SkIRect::MakeXYWH(0, 0, 100, 100);
     SkIRect expectedBounds = SkIRect::MakeXYWH(-133, -133, 236, 236);
-    filter2->filterBounds(bounds, SkMatrix::I(), &bounds);
+    bounds = filter2->filterBounds(bounds, SkMatrix::I());
 
     REPORTER_ASSERT(reporter, bounds == expectedBounds);
 }
 
 DEF_TEST(ImageFilterShadowThenBlurBounds, reporter) {
     SkAutoTUnref<SkImageFilter> filter1(makeDropShadow());
     SkAutoTUnref<SkImageFilter> filter2(makeBlur(filter1.get()));
 
     SkIRect bounds = SkIRect::MakeXYWH(0, 0, 100, 100);
     SkIRect expectedBounds = SkIRect::MakeXYWH(-133, -133, 236, 236);
-    filter2->filterBounds(bounds, SkMatrix::I(), &bounds);
+    bounds = filter2->filterBounds(bounds, SkMatrix::I());
 
     REPORTER_ASSERT(reporter, bounds == expectedBounds);
 }
 
 DEF_TEST(ImageFilterDilateThenBlurBounds, reporter) {
     SkAutoTUnref<SkImageFilter> filter1(SkDilateImageFilter::Create(2, 2));
     SkAutoTUnref<SkImageFilter> filter2(makeDropShadow(filter1.get()));
 
     SkIRect bounds = SkIRect::MakeXYWH(0, 0, 100, 100);
     SkIRect expectedBounds = SkIRect::MakeXYWH(-132, -132, 234, 234);
-    filter2->filterBounds(bounds, SkMatrix::I(), &bounds);
+    bounds = filter2->filterBounds(bounds, SkMatrix::I());
 
     REPORTER_ASSERT(reporter, bounds == expectedBounds);
 }
 
 DEF_TEST(ImageFilterComposedBlurFastBounds, reporter) {
     SkAutoTUnref<SkImageFilter> filter1(makeBlur());
     SkAutoTUnref<SkImageFilter> filter2(makeBlur());
     SkAutoTUnref<SkImageFilter> composedFilter(SkComposeImageFilter::Create(filter1.get(), filter2.get()));
 
     SkRect boundsSrc = SkRect::MakeWH(SkIntToScalar(100), SkIntToScalar(100));
     SkRect expectedBounds = SkRect::MakeXYWH(
         SkIntToScalar(-6), SkIntToScalar(-6), SkIntToScalar(112), SkIntToScalar(112));
-    SkRect boundsDst = SkRect::MakeEmpty();
-    composedFilter->computeFastBounds(boundsSrc, &boundsDst);
+    SkRect boundsDst = composedFilter->computeFastBounds(boundsSrc);
 
     REPORTER_ASSERT(reporter, boundsDst == expectedBounds);
 }
 
 DEF_TEST(ImageFilterUnionBounds, reporter) {
     SkAutoTUnref<SkImageFilter> offset(SkOffsetImageFilter::Create(50, 0));
     // Regardless of which order they appear in, the image filter bounds should
     // be combined correctly.
     {
         SkAutoTUnref<SkImageFilter> composite(SkXfermodeImageFilter::Create(
             nullptr, offset.get(), nullptr));
         SkRect bounds = SkRect::MakeWH(100, 100);
         // Intentionally aliasing here, as that's what the real callers do.
-        composite->computeFastBounds(bounds, &bounds);
+        bounds = composite->computeFastBounds(bounds);
         REPORTER_ASSERT(reporter, bounds == SkRect::MakeWH(150, 100));
     }
     {
         SkAutoTUnref<SkImageFilter> composite(SkXfermodeImageFilter::Create(
             nullptr, nullptr, offset.get()));
         SkRect bounds = SkRect::MakeWH(100, 100);
         // Intentionally aliasing here, as that's what the real callers do.
-        composite->computeFastBounds(bounds, &bounds);
+        bounds = composite->computeFastBounds(bounds);
         REPORTER_ASSERT(reporter, bounds == SkRect::MakeWH(150, 100));
     }
 }
 
 static void test_imagefilter_merge_result_size(SkImageFilter::Proxy* proxy,
                                                skiatest::Reporter* reporter,
                                                GrContext* context) {
     SkBitmap greenBM;
     greenBM.allocN32Pixels(20, 20);
     greenBM.eraseColor(SK_ColorGREEN);
@@ skipping 771 matching lines @@
     test_xfermode_cropped_input(&canvas, reporter);
 }
 
 DEF_GPUTEST_FOR_ALL_CONTEXTS(BlurLargeImage_Gpu, reporter, context) {
     SkAutoTUnref<SkSurface> surface(
         SkSurface::NewRenderTarget(context, SkBudgeted::kYes,
                                    SkImageInfo::MakeN32Premul(100, 100)));
     test_large_blur_input(reporter, surface->getCanvas());
 }
 #endif