AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

skip zero-length linear gradient intervals to make new code more consistent with older table-based implementation

Browse Source 
BUG=skia:4841
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1619413002

Review URL: https://codereview.chromium.org/1619413002
This commit is contained in:
lsalzman 2016-01-22 14:03:02 -08:00 committed by Commit bot
parent 32235eac4b
commit f2b8662b5c
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/effects/gradients/SkLinearGradient.cpp
View File

@ -100,7 +100,12 @@ SkLinearGradient::LinearGradientContext::LinearGradientContext(
SkDEBUGCODE(rec[0].fPosScale = SK_FloatNaN;) // should never get used
for (int i = 1; i < count; ++i) {
rec[i].fPos = SkTPin(shader.fOrigPos[i], rec[i - 1].fPos, 1.0f);
rec[i].fPosScale = 1.0f / (rec[i].fPos - rec[i - 1].fPos);
float diff = rec[i].fPos - rec[i - 1].fPos;
if (diff > 0) {
rec[i].fPosScale = 1.0f / diff;
} else {
rec[i].fPosScale = 0;
}
}
rec[count - 1].fPos = 1; // overwrite the last value just to be sure we end at 1.0
} else {
@ -483,7 +488,7 @@ find_forward(const SkLinearGradient::LinearGradientContext::Rec rec[], float til
SkASSERT(rec[1].fPos >= 0 && rec[1].fPos <= 1);
SkASSERT(rec[0].fPos <= rec[1].fPos);
rec += 1;
while (rec->fPos < tiledX) {
while (rec->fPos < tiledX || rec->fPosScale == 0) {
SkASSERT(rec[0].fPos >= 0 && rec[0].fPos <= 1);
SkASSERT(rec[1].fPos >= 0 && rec[1].fPos <= 1);
SkASSERT(rec[0].fPos <= rec[1].fPos);
@ -499,7 +504,7 @@ find_backward(const SkLinearGradient::LinearGradientContext::Rec rec[], float ti
SkASSERT(rec[0].fPos >= 0 && rec[0].fPos <= 1);
SkASSERT(rec[1].fPos >= 0 && rec[1].fPos <= 1);
SkASSERT(rec[0].fPos <= rec[1].fPos);
while (tiledX < rec->fPos) {
while (tiledX < rec->fPos || rec[1].fPosScale == 0) {
rec -= 1;
SkASSERT(rec[0].fPos >= 0 && rec[0].fPos <= 1);
SkASSERT(rec[1].fPos >= 0 && rec[1].fPos <= 1);