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

Fix Rob's nits from https://codereview.chromium.org/2085913003

Browse Source 
TBR=robertphillips@google.com
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2087393003

Review-Url: https://codereview.chromium.org/2087393003
This commit is contained in:
bsalomon 2016-06-23 12:23:07 -07:00 committed by Commit bot
parent 41bb5b40e7
commit ac5fcea9c3
2 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gpu/GrShape.cpp
View File

@ -337,7 +337,7 @@ void GrShape::attemptToSimplifyPath() {
this->style().strokeRec().getStyle() == SkStrokeRec::kHairline_Style) {
// Stroke styles don't differentiate between winding and even/odd.
// Moreover, dashing ignores inverseness (skbug.com/5421)
bool inverse = !this->fStyle.isDashed() && fPath.get()->isInverseFillType();
bool inverse = !this->style().isDashed() && fPath.get()->isInverseFillType();
if (inverse) {
fPath.get()->setFillType(kDefaultPathInverseFillType);
} else {

28
tests/GrShapeTest.cpp
View File

@ -263,8 +263,20 @@ void TestCase::testExpectations(skiatest::Reporter* reporter, SelfExpectations e
}
}
void check_equivalence(skiatest::Reporter* r, const GrShape& a, const GrShape& b,
const Key& keyA, const Key& keyB) {
static bool can_interchange_winding_and_even_odd_fill(const GrShape& shape) {
SkPath path;
shape.asPath(&path);
if (shape.style().hasNonDashPathEffect()) {
return false;
}
const SkStrokeRec::Style strokeRecStyle = shape.style().strokeRec().getStyle();
return strokeRecStyle == SkStrokeRec::kStroke_Style ||
strokeRecStyle == SkStrokeRec::kHairline_Style ||
(shape.style().isSimpleFill() && path.isConvex());
}
static void check_equivalence(skiatest::Reporter* r, const GrShape& a, const GrShape& b,
const Key& keyA, const Key& keyB) {
// GrShape only respects the input winding direction and start point for rrect shapes
// when there is a path effect. Thus, if there are two GrShapes representing the same rrect
// but one has a path effect in its style and the other doesn't then asPath() and the unstyled
@ -302,16 +314,8 @@ void check_equivalence(skiatest::Reporter* r, const GrShape& a, const GrShape& b
bool ignoreWindingVsEvenOdd = false;
if (SkPath::ConvertToNonInverseFillType(pathA.getFillType()) !=
SkPath::ConvertToNonInverseFillType(pathB.getFillType())) {
const SkStrokeRec::Style strokeRecStyleA = a.style().strokeRec().getStyle();
const SkStrokeRec::Style strokeRecStyleB = b.style().strokeRec().getStyle();
bool aCanChange = !a.style().hasNonDashPathEffect() &&
(strokeRecStyleA == SkStrokeRec::kStroke_Style ||
strokeRecStyleA == SkStrokeRec::kHairline_Style ||
(a.style().isSimpleFill() && pathA.isConvex()));
bool bCanChange = !b.style().hasNonDashPathEffect() &&
(strokeRecStyleB == SkStrokeRec::kStroke_Style ||
strokeRecStyleB == SkStrokeRec::kHairline_Style ||
(b.style().isSimpleFill() && pathB.isConvex()));
bool aCanChange = can_interchange_winding_and_even_odd_fill(a);
bool bCanChange = can_interchange_winding_and_even_odd_fill(b);
if (aCanChange != bCanChange) {
ignoreWindingVsEvenOdd = true;
}