Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(302)

Side by Side Diff: src/effects/SkTileImageFilter.cpp

Issue 1152553006: Fix dst bound reported by SkTileImageFilter (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: clean up Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright 2013 Google Inc. 2 * Copyright 2013 Google Inc.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license that can be 4 * Use of this source code is governed by a BSD-style license that can be
5 * found in the LICENSE file. 5 * found in the LICENSE file.
6 */ 6 */
7 7
8 #include "SkTileImageFilter.h" 8 #include "SkTileImageFilter.h"
9 #include "SkBitmap.h" 9 #include "SkBitmap.h"
10 #include "SkCanvas.h" 10 #include "SkCanvas.h"
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 &shaderMatrix)); 75 &shaderMatrix));
76 paint.setShader(shader); 76 paint.setShader(shader);
77 canvas.translate(-dstRect.fLeft, -dstRect.fTop); 77 canvas.translate(-dstRect.fLeft, -dstRect.fTop);
78 canvas.drawRect(dstRect, paint); 78 canvas.drawRect(dstRect, paint);
79 *dst = device->accessBitmap(false); 79 *dst = device->accessBitmap(false);
80 offset->fX = dstIRect.fLeft; 80 offset->fX = dstIRect.fLeft;
81 offset->fY = dstIRect.fTop; 81 offset->fY = dstIRect.fTop;
82 return true; 82 return true;
83 } 83 }
84 84
85 void SkTileImageFilter::computeFastBounds(const SkRect& src, SkRect* dst) const {
86 *dst = fDstRect;
87 }
88
85 bool SkTileImageFilter::onFilterBounds(const SkIRect& src, const SkMatrix& ctm, 89 bool SkTileImageFilter::onFilterBounds(const SkIRect& src, const SkMatrix& ctm,
86 SkIRect* dst) const { 90 SkIRect* dst) const {
87 SkRect srcRect; 91 SkRect srcRect;
88 ctm.mapRect(&srcRect, fSrcRect); 92 ctm.mapRect(&srcRect, fSrcRect);
89 SkIRect srcIRect; 93 SkIRect srcIRect;
90 srcRect.roundOut(&srcIRect); 94 srcRect.roundOut(&srcIRect);
91 srcIRect.join(src); 95 srcIRect.join(src);
92 *dst = srcIRect; 96 *dst = srcIRect;
93 return true; 97 return true;
94 } 98 }
95 99
96 SkFlattenable* SkTileImageFilter::CreateProc(SkReadBuffer& buffer) { 100 SkFlattenable* SkTileImageFilter::CreateProc(SkReadBuffer& buffer) {
97 SK_IMAGEFILTER_UNFLATTEN_COMMON(common, 1); 101 SK_IMAGEFILTER_UNFLATTEN_COMMON(common, 1);
98 SkRect src, dst; 102 SkRect src, dst;
99 buffer.readRect(&src); 103 buffer.readRect(&src);
100 buffer.readRect(&dst); 104 buffer.readRect(&dst);
101 return Create(src, dst, common.getInput(0)); 105 return Create(src, dst, common.getInput(0));
102 } 106 }
103 107
104 void SkTileImageFilter::flatten(SkWriteBuffer& buffer) const { 108 void SkTileImageFilter::flatten(SkWriteBuffer& buffer) const {
105 this->INHERITED::flatten(buffer); 109 this->INHERITED::flatten(buffer);
106 buffer.writeRect(fSrcRect); 110 buffer.writeRect(fSrcRect);
107 buffer.writeRect(fDstRect); 111 buffer.writeRect(fDstRect);
108 } 112 }
109 113
110 #ifndef SK_IGNORE_TO_STRING 114 #ifndef SK_IGNORE_TO_STRING
111 void SkTileImageFilter::toString(SkString* str) const { 115 void SkTileImageFilter::toString(SkString* str) const {
112 str->appendf("SkTileImageFilter: ("); 116 str->appendf("SkTileImageFilter: (");
117 str->appendf("src: %.2f %.2f %.2f %.2f",
118 fSrcRect.fLeft, fSrcRect.fTop, fSrcRect.fRight, fSrcRect.fBotto m);
119 str->appendf(" dst: %.2f %.2f %.2f %.2f",
120 fDstRect.fLeft, fDstRect.fTop, fDstRect.fRight, fDstRect.fBotto m);
121 if (this->getInput(0)) {
122 str->appendf("input: (");
123 this->getInput(0)->toString(str);
124 str->appendf(")");
125 }
113 str->append(")"); 126 str->append(")");
114 } 127 }
115 #endif 128 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698