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

Don't use the inner radius when not stroking in DIEllipse

Browse Source 
Bug: skia:7769
Change-Id: Ida462aec8ad832f01aec07602d8be5735a9b0ca2
Reviewed-on: https://skia-review.googlesource.com/118582
Commit-Queue: Greg Daniel <egdaniel@google.com>
Reviewed-by: Jim Van Verth <jvanverth@google.com>
This commit is contained in:
Greg Daniel 2018-04-04 08:59:20 -04:00 committed by Skia Commit-Bot
parent d40133092a
commit 75a130258d
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/gpu/ops/GrOvalOpFactory.cpp
View File

@ -1533,28 +1533,39 @@ private:
SkScalar offsetDx = ellipse.fGeoDx / xRadius;
SkScalar offsetDy = ellipse.fGeoDy / yRadius;
SkScalar innerRatioX = xRadius / ellipse.fInnerXRadius;
SkScalar innerRatioY = yRadius / ellipse.fInnerYRadius;
verts[0].fPos = SkPoint::Make(bounds.fLeft, bounds.fTop);
verts[0].fColor = color;
verts[0].fOuterOffset = SkPoint::Make(-1.0f - offsetDx, -1.0f - offsetDy);
verts[0].fInnerOffset = SkPoint::Make(-innerRatioX - offsetDx, -innerRatioY - offsetDy);
verts[0].fInnerOffset = SkPoint::Make(0.0f, 0.0f);
verts[1].fPos = SkPoint::Make(bounds.fLeft, bounds.fBottom);
verts[1].fColor = color;
verts[1].fOuterOffset = SkPoint::Make(-1.0f - offsetDx, 1.0f + offsetDy);
verts[1].fInnerOffset = SkPoint::Make(-innerRatioX - offsetDx, innerRatioY + offsetDy);
verts[1].fInnerOffset = SkPoint::Make(0.0f, 0.0f);
verts[2].fPos = SkPoint::Make(bounds.fRight, bounds.fTop);
verts[2].fColor = color;
verts[2].fOuterOffset = SkPoint::Make(1.0f + offsetDx, -1.0f - offsetDy);
verts[2].fInnerOffset = SkPoint::Make(innerRatioX + offsetDx, -innerRatioY - offsetDy);
verts[2].fInnerOffset = SkPoint::Make(0.0f, 0.0f);
verts[3].fPos = SkPoint::Make(bounds.fRight, bounds.fBottom);
verts[3].fColor = color;
verts[3].fOuterOffset = SkPoint::Make(1.0f + offsetDx, 1.0f + offsetDy);
verts[3].fInnerOffset = SkPoint::Make(innerRatioX + offsetDx, innerRatioY + offsetDy);
verts[3].fInnerOffset = SkPoint::Make(0.0f, 0.0f);
if (DIEllipseStyle::kStroke == this->style()) {
SkScalar innerRatioX = xRadius / ellipse.fInnerXRadius;
SkScalar innerRatioY = yRadius / ellipse.fInnerYRadius;
verts[0].fInnerOffset = SkPoint::Make(-innerRatioX - offsetDx,
-innerRatioY - offsetDy);
verts[1].fInnerOffset = SkPoint::Make(-innerRatioX - offsetDx,
innerRatioY + offsetDy);
verts[2].fInnerOffset = SkPoint::Make(innerRatioX + offsetDx,
-innerRatioY - offsetDy);
verts[3].fInnerOffset = SkPoint::Make(innerRatioX + offsetDx,
innerRatioY + offsetDy);
}
verts += kVerticesPerQuad;
}