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

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

Issue 1570133003: Fix SkTileImageFilter when srcRect is a superset of bitmap bounds. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Fix 100-col issues Created 4 years, 11 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
« no previous file with comments | « src/core/SkImageFilter.cpp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 if (!fSrcRect.width() || !fSrcRect.height() || !w || !h) { 47 if (!fSrcRect.width() || !fSrcRect.height() || !w || !h) {
48 return false; 48 return false;
49 } 49 }
50 50
51 SkRect srcRect; 51 SkRect srcRect;
52 ctx.ctm().mapRect(&srcRect, fSrcRect); 52 ctx.ctm().mapRect(&srcRect, fSrcRect);
53 SkIRect srcIRect; 53 SkIRect srcIRect;
54 srcRect.roundOut(&srcIRect); 54 srcRect.roundOut(&srcIRect);
55 srcIRect.offset(-srcOffset); 55 srcIRect.offset(-srcOffset);
56 SkBitmap subset; 56 SkBitmap subset;
57 SkIRect bounds; 57 SkIRect srcBounds;
58 source.getBounds(&bounds); 58 source.getBounds(&srcBounds);
59 59
60 if (!srcIRect.intersect(bounds)) { 60 if (!SkIRect::Intersects(srcIRect, srcBounds)) {
61 offset->fX = offset->fY = 0; 61 offset->fX = offset->fY = 0;
62 return true; 62 return true;
63 } else if (!source.extractSubset(&subset, srcIRect)) {
64 return false;
65 } 63 }
64 if (srcBounds.contains(srcIRect)) {
65 if (!source.extractSubset(&subset, srcIRect)) {
66 return false;
67 }
68 } else {
69 SkAutoTUnref<SkBaseDevice> device(proxy->createDevice(srcIRect.width(),
70 srcIRect.height(),
71 kPossible_TileUsag e));
72 if (!device) {
73 return false;
74 }
75 SkCanvas canvas(device);
76 canvas.drawBitmap(src, SkIntToScalar(srcOffset.x()),
77 SkIntToScalar(srcOffset.y()));
78 subset = device->accessBitmap(false);
79 }
80 SkASSERT(subset.width() == srcIRect.width());
81 SkASSERT(subset.height() == srcIRect.height());
66 82
67 SkAutoTUnref<SkBaseDevice> device(proxy->createDevice(w, h)); 83 SkAutoTUnref<SkBaseDevice> device(proxy->createDevice(w, h));
68 if (nullptr == device.get()) { 84 if (nullptr == device.get()) {
69 return false; 85 return false;
70 } 86 }
71 SkCanvas canvas(device); 87 SkCanvas canvas(device);
72 SkPaint paint; 88 SkPaint paint;
73 paint.setXfermodeMode(SkXfermode::kSrc_Mode); 89 paint.setXfermodeMode(SkXfermode::kSrc_Mode);
74 90
75 SkMatrix shaderMatrix;
76 shaderMatrix.setTranslate(SkIntToScalar(srcOffset.fX),
77 SkIntToScalar(srcOffset.fY));
78 SkAutoTUnref<SkShader> shader(SkShader::CreateBitmapShader(subset, 91 SkAutoTUnref<SkShader> shader(SkShader::CreateBitmapShader(subset,
79 SkShader::kRepeat_TileMode, SkShader::kRepeat_ TileMode, 92 SkShader::kRepeat_TileMode, SkShader::kRepeat_ TileMode));
80 &shaderMatrix));
81 paint.setShader(shader); 93 paint.setShader(shader);
82 canvas.translate(-dstRect.fLeft, -dstRect.fTop); 94 canvas.translate(-dstRect.fLeft, -dstRect.fTop);
83 canvas.drawRect(dstRect, paint); 95 canvas.drawRect(dstRect, paint);
84 *dst = device->accessBitmap(false); 96 *dst = device->accessBitmap(false);
85 offset->fX = dstIRect.fLeft; 97 offset->fX = dstIRect.fLeft;
86 offset->fY = dstIRect.fTop; 98 offset->fY = dstIRect.fTop;
87 return true; 99 return true;
88 } 100 }
89 101
90 void SkTileImageFilter::onFilterNodeBounds(const SkIRect& src, const SkMatrix& c tm, 102 void SkTileImageFilter::onFilterNodeBounds(const SkIRect& src, const SkMatrix& c tm,
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
135 str->appendf(" dst: %.2f %.2f %.2f %.2f", 147 str->appendf(" dst: %.2f %.2f %.2f %.2f",
136 fDstRect.fLeft, fDstRect.fTop, fDstRect.fRight, fDstRect.fBotto m); 148 fDstRect.fLeft, fDstRect.fTop, fDstRect.fRight, fDstRect.fBotto m);
137 if (this->getInput(0)) { 149 if (this->getInput(0)) {
138 str->appendf("input: ("); 150 str->appendf("input: (");
139 this->getInput(0)->toString(str); 151 this->getInput(0)->toString(str);
140 str->appendf(")"); 152 str->appendf(")");
141 } 153 }
142 str->append(")"); 154 str->append(")");
143 } 155 }
144 #endif 156 #endif
OLDNEW
« no previous file with comments | « src/core/SkImageFilter.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698