Image filters: Make a recursive, forward-mapping bounds traversal.

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 "SkDevice.h"
 #include "SkReadBuffer.h"
@@ skipping 264 matching lines @@
 void SkDisplacementMapEffect::onFilterNodeBounds(const SkIRect& src, const SkMatrix& ctm,
                                    SkIRect* dst, MapDirection) const {
     *dst = src;
     SkVector scale = SkVector::Make(fScale, fScale);
     ctm.mapVectors(&scale, 1);
     dst->outset(SkScalarCeilToInt(SkScalarAbs(scale.fX) * SK_ScalarHalf),
                 SkScalarCeilToInt(SkScalarAbs(scale.fY) * SK_ScalarHalf));
 }
 
 bool SkDisplacementMapEffect::onFilterBounds(const SkIRect& src, const SkMatrix& ctm,
-                                   SkIRect* dst) const {
-    SkIRect bounds;
-    this->onFilterNodeBounds(src, ctm, &bounds, kReverse_MapDirection);
+                                             SkIRect* dst, MapDirection direction) const {
+    // Recurse only into color input.
     if (this->getColorInput()) {
-        return this->getColorInput()->filterBounds(bounds, ctm, dst);
+        return this->getColorInput()->filterBounds(src, ctm, dst, direction);
     }
-    *dst = bounds;
+    *dst = src;
     return true;
 }
 
 #ifndef SK_IGNORE_TO_STRING
 void SkDisplacementMapEffect::toString(SkString* str) const {
     str->appendf("SkDisplacementMapEffect: (");
     str->appendf("scale: %f ", fScale);
     str->appendf("displacement: (");
     if (this->getDisplacementInput()) {
         this->getDisplacementInput()->toString(str);
@@ skipping 339 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