Revert of Revert of Fix SkTileImageFilter clipping/cropRect interaction issue

src/effects/SkDisplacementMapEffect.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 "SkDisplacementMapEffect.h"
 #include "SkReadBuffer.h"
 #include "SkWriteBuffer.h"
@@ skipping 251 matching lines @@
 void SkDisplacementMapEffect::computeFastBounds(const SkRect& src, SkRect* dst) const {
     if (getColorInput()) {
         getColorInput()->computeFastBounds(src, dst);
     } else {
         *dst = src;
     }
     dst->outset(fScale * SK_ScalarHalf, fScale * SK_ScalarHalf);
 }
 
 bool SkDisplacementMapEffect::onFilterBounds(const SkIRect& src, const SkMatrix& ctm,
-                                   SkIRect* dst) const {
+                                             SkIRect* dst) const {
     SkIRect bounds = src;
     SkVector scale = SkVector::Make(fScale, fScale);
     ctm.mapVectors(&scale, 1);
     bounds.outset(SkScalarCeilToInt(scale.fX * SK_ScalarHalf),
                   SkScalarCeilToInt(scale.fY * SK_ScalarHalf));
     if (getColorInput()) {
         return getColorInput()->filterBounds(bounds, ctm, dst);
     }
     *dst = bounds;
     return true;
 }
 
 #ifndef SK_IGNORE_TO_STRING
 void SkDisplacementMapEffect::toString(SkString* str) const {
     str->appendf("SkDisplacementMapEffect: (");
+    this->getCropRect().toString(str);
     str->appendf("scale: %f ", fScale);
     str->appendf("displacement: (");
     if (this->getDisplacementInput()) {
         this->getDisplacementInput()->toString(str);
     }
     str->appendf(") color: (");
     if (this->getColorInput()) {
         this->getColorInput()->toString(str);
     }
     str->appendf("))");
@@ skipping 346 matching lines @@
                                        const GrGLSLCaps&, GrProcessorKeyBuilder* b) {
     const GrDisplacementMapEffect& displacementMap = proc.cast<GrDisplacementMapEffect>();
 
     uint32_t xKey = displacementMap.xChannelSelector();
     uint32_t yKey = displacementMap.yChannelSelector() << kChannelSelectorKeyBits;
 
     b->add32(xKey | yKey);
 }
 #endif