Revert "Implement support for expanding crop rects in image filters"

src/effects/SkMergeImageFilter.cpp

 /*
  * Copyright 2012 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 "SkMergeImageFilter.h"
 #include "SkCanvas.h"
 #include "SkDevice.h"
@@ skipping 55 matching lines @@
 }
 
 bool SkMergeImageFilter::onFilterImage(Proxy* proxy, const SkBitmap& src,
                                        const Context& ctx,
                                        SkBitmap* result, SkIPoint* offset) const {
     if (countInputs() < 1) {
         return false;
     }
 
     SkIRect bounds;
-    if (!this->applyCropRect(ctx, src, SkIPoint::Make(0, 0), &bounds)) {
+    src.getBounds(&bounds);
+    if (!this->applyCropRect(&bounds, ctx.ctm())) {
         return false;
     }
 
     const int x0 = bounds.left();
     const int y0 = bounds.top();
 
     SkAutoTUnref<SkBaseDevice> dst(proxy->createDevice(bounds.width(), bounds.height()));
     if (NULL == dst) {
         return false;
     }
@@ skipping 49 matching lines @@
         if (buffer.validate(buffer.getArrayCount() == size) &&
             buffer.readByteArray(fModes, size)) {
             for (int i = 0; i < nbInputs; ++i) {
                 buffer.validate(SkIsValidMode((SkXfermode::Mode)fModes[i]));
             }
         }
     } else {
         fModes = 0;
     }
 }