diff options
| author | bsalomon <bsalomon@google.com> | 2015-07-01 11:02:50 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-07-01 11:02:50 -0700 |
| commit | ebaf6a69bf604c85185e23aca3fb93308e747ff5 (patch) | |
| tree | 14f27fb728a4c13781790b4ae90a03d5e5c41428 /src/effects/SkDisplacementMapEffect.cpp | |
| parent | 4417c7f8bb85aa1eae536cc50c70c0cc87f31171 (diff) | |
| download | platform_external_skqp-ebaf6a69bf604c85185e23aca3fb93308e747ff5.tar.gz platform_external_skqp-ebaf6a69bf604c85185e23aca3fb93308e747ff5.tar.bz2 platform_external_skqp-ebaf6a69bf604c85185e23aca3fb93308e747ff5.zip | |
Revert of Fix SkTileImageFilter clipping/cropRect interaction issue (patchset #2 id:30001 of https://codereview.chromium.org/1210053003/)
Reason for revert:
Perf regression: https://code.google.com/p/chromium/issues/detail?id=505564
Original issue's description:
> Fix SkTileImageFilter clipping/cropRect interaction issue
>
> BUG=499499
>
> Committed: https://skia.googlesource.com/skia/+/157bcd0840b578060dbc3365daafffc6837da391
TBR=reed@google.com,senorblanco@google.com,senorblanco@chromium.org,robertphillips@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=499499
Review URL: https://codereview.chromium.org/1219193002
Diffstat (limited to 'src/effects/SkDisplacementMapEffect.cpp')
| -rw-r--r-- | src/effects/SkDisplacementMapEffect.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/effects/SkDisplacementMapEffect.cpp b/src/effects/SkDisplacementMapEffect.cpp index 0eac80ff8a..d7d92c82b9 100644 --- a/src/effects/SkDisplacementMapEffect.cpp +++ b/src/effects/SkDisplacementMapEffect.cpp @@ -269,7 +269,7 @@ void SkDisplacementMapEffect::computeFastBounds(const SkRect& src, SkRect* dst) } 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); @@ -285,7 +285,6 @@ bool SkDisplacementMapEffect::onFilterBounds(const SkIRect& src, const SkMatrix& #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()) { |