Revert of Fix recursive computation of filter bounds for drop shadow,

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"
 #include "SkBitmapSource.h"
@@ skipping 451 matching lines @@
 
     for (int y = 0; y < height; y++) {
         int diffs = memcmp(result1.getAddr32(0, y), result2.getAddr32(0, y), result1.rowBytes());
         REPORTER_ASSERT(reporter, !diffs);
         if (diffs) {
             break;
         }
     }
 }
 
-static SkImageFilter* makeBlur(SkImageFilter* input = NULL) {
-    return SkBlurImageFilter::Create(SK_Scalar1, SK_Scalar1, input);
-}
-
-static SkImageFilter* makeDropShadow(SkImageFilter* input = NULL) {
-    return SkDropShadowImageFilter::Create(
-        SkIntToScalar(100), SkIntToScalar(100),
-        SkIntToScalar(10), SkIntToScalar(10),
-        SK_ColorBLUE, input);
-}
-
-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(), &bounds);
-
-    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(), &bounds);
-
-    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(), &bounds);
-
-    REPORTER_ASSERT(reporter, bounds == expectedBounds);
-}
-
 static void drawBlurredRect(SkCanvas* canvas) {
     SkAutoTUnref<SkImageFilter> filter(SkBlurImageFilter::Create(SkIntToScalar(8), 0));
     SkPaint filterPaint;
     filterPaint.setColor(SK_ColorWHITE);
     filterPaint.setImageFilter(filter);
     canvas->saveLayer(NULL, &filterPaint);
     SkPaint whitePaint;
     whitePaint.setColor(SK_ColorWHITE);
     canvas->drawRect(SkRect::Make(SkIRect::MakeWH(4, 4)), whitePaint);
     canvas->restore();
@@ skipping 427 matching lines @@
 }
 
 DEF_GPUTEST(XfermodeImageFilterCroppedInputGPU, reporter, factory) {
     GrContext* context = factory->get(static_cast<GrContextFactory::GLContextType>(0));
     SkAutoTUnref<SkGpuDevice> device(SkGpuDevice::Create(context,
                                                          SkImageInfo::MakeN32Premul(1, 1),
                                                          0));
     test_xfermode_cropped_input(device, reporter);
 }
 #endif