Fixed more issues

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 "SkFlattenableBuffers.h"
 #include "SkUnPreMultiply.h"
@@ skipping 187 matching lines @@
 
     SkAutoLockPixels alp_displacement(displ), alp_color(color);
     if (!displ.getPixels() || !color.getPixels()) {
         return false;
     }
     SkIRect bounds;
     color.getBounds(&bounds);
     if (!this->applyCropRect(&bounds, ctm)) {
         return false;
     }
+    SkIRect displBounds;
+    displ.getBounds(&displBounds);
+    if (!this->applyCropRect(&displBounds, ctm)) {

[Stephen White, 2013/12/09 21:16:12]

Please add a GM test case for this.

+        return false;
+    }
+    if (!bounds.intersect(displBounds)) {
+        return false;
+    }
 
     dst->setConfig(color.config(), bounds.width(), bounds.height());
     dst->allocPixels();
     if (!dst->getPixels()) {
         return false;
     }
 
     computeDisplacement(fXChannelSelector, fYChannelSelector, fScale, dst, &displ, &color, bounds);
 
     offset->fX += bounds.left();
@@ skipping 109 matching lines @@
     GrContext::AutoRenderTarget art(context, dst->asRenderTarget());
 
     GrPaint paint;
     paint.addColorEffect(
         GrDisplacementMapEffect::Create(fXChannelSelector,
                                         fYChannelSelector,
                                         fScale,
                                         displacement,
                                         color))->unref();
     SkIRect bounds;
     src.getBounds(&bounds);

[Stephen White, 2013/12/09 21:17:23]

Shouldn't we also be applying the crop rect to the displacement image here?

     if (!this->applyCropRect(&bounds, ctm)) {
         return false;
     }
     SkRect srcRect = SkRect::Make(bounds);
     SkRect dstRect = SkRect::MakeWH(srcRect.width(), srcRect.height());
     context->drawRectToRect(paint, dstRect, srcRect);
     offset->fX += bounds.left();
     offset->fY += bounds.top();
     return SkImageFilterUtils::WrapTexture(dst, bounds.width(), bounds.height(), result);
 }
@@ skipping 176 matching lines @@
                                                         const GrGLCaps&) {
     const GrDisplacementMapEffect& displacementMap =
         drawEffect.castEffect<GrDisplacementMapEffect>();
 
     EffectKey xKey = displacementMap.xChannelSelector();
     EffectKey yKey = displacementMap.yChannelSelector() << SkDisplacementMapEffect::kKeyBits;
 
     return xKey | yKey;
 }
 #endif