aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/effects/SkTileImageFilter.cpp
diff options
context:
space:
mode:
authorGravatar robertphillips <robertphillips@google.com>2015-06-02 10:57:26 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2015-06-02 10:57:26 -0700
commita66cc7e1e01bab8590fdcfafb269e21bfe8782fa (patch)
tree97a2ebe8c1375f3e8a5d12277cdbd3fdd9b2b076 /src/effects/SkTileImageFilter.cpp
parent05be93bbdf09576f7903130e3b106b0a8c7c4b4e (diff)
Revert of Fix dst bound reported by SkTileImageFilter (patchset #3 id:40001 of https://codereview.chromium.org/1152553006/)
Reason for revert: breaking tests Original issue's description: > Fix dst bound reported by SkTileImageFilter > > In the example from the bug we had the filter DAG: > > color filter (table) > 0: xfermode filter (arith) > 0: tile filter [0,80,34,114] -> [0,80,800,480] > 0: color filter (table) > 0: bitmap src 34x34 -> [0,80,34,114] > 1: color filter (table) > 0: picture filter [0, 80, 800, 480] > > computeFastBounds was coming out of the DAG with a bound of [0,80,34,114] which didn't represent the pixels that would be drawn. > > This CL updates SkTileImageFilter to correctly set the bound for the pixels it will hit. > > BUG=493783 > > Committed: https://skia.googlesource.com/skia/+/05be93bbdf09576f7903130e3b106b0a8c7c4b4e TBR=reed@google.com,senorblanco@google.com,senorblanco@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=493783 Review URL: https://codereview.chromium.org/1143083006
Diffstat (limited to 'src/effects/SkTileImageFilter.cpp')
-rw-r--r--src/effects/SkTileImageFilter.cpp13
1 files changed, 0 insertions, 13 deletions
diff --git a/src/effects/SkTileImageFilter.cpp b/src/effects/SkTileImageFilter.cpp
index 6acf9fd5ac..c5cf51871d 100644
--- a/src/effects/SkTileImageFilter.cpp
+++ b/src/effects/SkTileImageFilter.cpp
@@ -82,10 +82,6 @@ bool SkTileImageFilter::onFilterImage(Proxy* proxy, const SkBitmap& src,
return true;
}
-void SkTileImageFilter::computeFastBounds(const SkRect& src, SkRect* dst) const {
- *dst = fDstRect;
-}
-
bool SkTileImageFilter::onFilterBounds(const SkIRect& src, const SkMatrix& ctm,
SkIRect* dst) const {
SkRect srcRect;
@@ -114,15 +110,6 @@ void SkTileImageFilter::flatten(SkWriteBuffer& buffer) const {
#ifndef SK_IGNORE_TO_STRING
void SkTileImageFilter::toString(SkString* str) const {
str->appendf("SkTileImageFilter: (");
- str->appendf("src: %.2f %.2f %.2f %.2f",
- fSrcRect.fLeft, fSrcRect.fTop, fSrcRect.fRight, fSrcRect.fBottom);
- str->appendf(" dst: %.2f %.2f %.2f %.2f",
- fDstRect.fLeft, fDstRect.fTop, fDstRect.fRight, fDstRect.fBottom);
- if (this->getInput(0)) {
- str->appendf("input: (");
- this->getInput(0)->toString(str);
- str->appendf(")");
- }
str->append(")");
}
#endif