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

Remove undefined behavior from innershapes gm

Browse Source 
It is undefined for the inner rrect to not be contained in the inner.

Change-Id: I632060771fb7918050e1836d17b4702ea765a08f
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/384116
Reviewed-by: Michael Ludwig <michaelludwig@google.com>
Commit-Queue: Chris Dalton <csmartdalton@google.com>
This commit is contained in:
Chris Dalton 2021-03-12 01:04:35 -07:00 committed by Skia Commit-Bot
parent 82fe4d2243
commit 1bb1f220bd
1 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
gm/shapes.cpp
View File

@ -140,10 +140,29 @@ private:
const SkRRect& outer = fShapes[i];
const SkRRect& inner = fShapes[(i * 7 + 11) % fSimpleShapeCount];
float s = 0.95f * std::min(outer.rect().width() / inner.rect().width(),
outer.rect().height() / inner.rect().height());
outer.rect().height() / inner.rect().height());
SkMatrix innerXform;
float dx = (rand.nextF() - 0.5f) * (outer.rect().width() - s * inner.rect().width());
float dy = (rand.nextF() - 0.5f) * (outer.rect().height() - s * inner.rect().height());
// Fixup inner rects so they don't reach outside the outer rect.
switch (i) {
case 0:
s *= .85f;
break;
case 8:
s *= .4f;
dx = dy = 0;
break;
case 5:
s *= .75f;
dx = dy = 0;
break;
case 6:
s *= .65f;
dx = -5;
dy = 10;
break;
}
innerXform.setTranslate(outer.rect().centerX() + dx, outer.rect().centerY() + dy);
if (s < 1) {
innerXform.preScale(s, s);