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

Revert "Fix round join comparison in if"

Browse Source 
This reverts commit 9d4fa4f7bd.

Reason for revert: prior CL likely breaking chrome cc test

Original change's description:
> Fix round join comparison in if
> 
> This fixes adding round caps to empty rectangles with bevel joins.
> Introduced in https://skia-review.googlesource.com/c/skia/+/284803, I
> either forgot to finish my thought or inadvertently deleted it while
> editing.
> 
> TBR: ethannicholas@google.com, bsalomon@google.com
> 
> Change-Id: I72e6383260dae066c611454db9c7fa8c217422e4
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/285957
> Reviewed-by: Michael Ludwig <michaelludwig@google.com>
> Commit-Queue: Michael Ludwig <michaelludwig@google.com>

TBR=bsalomon@google.com,ethannicholas@google.com,michaelludwig@google.com

Change-Id: I02e21e5ec9c14312dc9f36575dc0edccffc33e1d
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/286038
Reviewed-by: Michael Ludwig <michaelludwig@google.com>
Commit-Queue: Michael Ludwig <michaelludwig@google.com>
This commit is contained in:
Michael Ludwig 2020-04-29 13:32:01 +00:00 committed by Skia Commit-Bot
parent e42af16143
commit d91d8b60ce
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gpu/geometry/GrStyledShape.cpp
View File

@ -664,7 +664,7 @@ void GrStyledShape::simplifyStroke(bool originallyClosed) {
// reflect the fact that it doesn't actually produce caps.
if (originallyClosed) {
SkPaint::Cap cap;
if (fShape.isLine() && fStyle.strokeRec().getJoin() == SkPaint::kRound_Join) {
if (fShape.isLine() && fStyle.strokeRec().getJoin()) {
// As a closed shape, the line moves from a to b and back to a, producing a 180 degree
// turn. With round joins, this would make a semi-circle at each end, which is visually
// identical to a round cap on the reduced line geometry.