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

Fix for SkPathRef::CreateTransformedCopy bug

Browse Source 
https://codereview.chromium.org/99423004/



git-svn-id: http://skia.googlecode.com/svn/trunk@12464 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
robertphillips@google.com 2013-12-03 17:15:36 +00:00
parent 466310dbd3
commit b06e88dc65
2 changed files with 84 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/core/SkPathRef.cpp
View File

@ -63,14 +63,20 @@ void SkPathRef::CreateTransformedCopy(SkAutoTUnref<SkPathRef>* dst,
return;
}
bool dstUnique = (*dst)->unique();
if (!dstUnique) {
if (!(*dst)->unique()) {
dst->reset(SkNEW(SkPathRef));
}
if (*dst != &src) {
(*dst)->resetToSize(src.fVerbCnt, src.fPointCnt, src.fConicWeights.count());
memcpy((*dst)->verbsMemWritable(), src.verbsMemBegin(), src.fVerbCnt * sizeof(uint8_t));
(*dst)->fConicWeights = src.fConicWeights;
}
SkASSERT((*dst)->countPoints() == src.countPoints());
SkASSERT((*dst)->countVerbs() == src.countVerbs());
SkASSERT((*dst)->fConicWeights.count() == src.fConicWeights.count());
// Need to check this here in case (&src == dst)
bool canXformBounds = !src.fBoundsIsDirty && matrix.rectStaysRect() && src.countPoints() > 1;

109
tests/PathTest.cpp
View File

@ -1913,7 +1913,7 @@ static void test_flattening(skiatest::Reporter* reporter) {
}
static void test_transform(skiatest::Reporter* reporter) {
SkPath p, p1;
SkPath p;
#define CONIC_PERSPECTIVE_BUG_FIXED 0
static const SkPoint pts[] = {
@ -1926,6 +1926,7 @@ static void test_transform(skiatest::Reporter* reporter) {
#endif
};
const int kPtCount = SK_ARRAY_COUNT(pts);
p.moveTo(pts[0]);
p.lineTo(pts[1]);
p.quadTo(pts[2], pts[3]);
@ -1934,43 +1935,85 @@ static void test_transform(skiatest::Reporter* reporter) {
p.conicTo(pts[4], pts[5], 0.5f);
#endif
p.close();
SkMatrix matrix;
matrix.reset();
p.transform(matrix, &p1);
REPORTER_ASSERT(reporter, p == p1);
matrix.setScale(SK_Scalar1 * 2, SK_Scalar1 * 3);
p.transform(matrix, &p1);
SkPoint pts1[kPtCount];
int count = p1.getPoints(pts1, kPtCount);
REPORTER_ASSERT(reporter, kPtCount == count);
for (int i = 0; i < count; ++i) {
SkPoint newPt = SkPoint::Make(pts[i].fX * 2, pts[i].fY * 3);
REPORTER_ASSERT(reporter, newPt == pts1[i]);
{
SkMatrix matrix;
matrix.reset();
SkPath p1;
p.transform(matrix, &p1);
REPORTER_ASSERT(reporter, p == p1);
}
{
SkMatrix matrix;
matrix.setScale(SK_Scalar1 * 2, SK_Scalar1 * 3);
SkPath p1; // Leave p1 non-unique (i.e., the empty path)
p.transform(matrix, &p1);
SkPoint pts1[kPtCount];
int count = p1.getPoints(pts1, kPtCount);
REPORTER_ASSERT(reporter, kPtCount == count);
for (int i = 0; i < count; ++i) {
SkPoint newPt = SkPoint::Make(pts[i].fX * 2, pts[i].fY * 3);
REPORTER_ASSERT(reporter, newPt == pts1[i]);
}
}
{
SkMatrix matrix;
matrix.reset();
matrix.setPerspX(SkScalarToPersp(4));
SkPath p1;
p1.moveTo(SkPoint::Make(0, 0));
p.transform(matrix, &p1);
REPORTER_ASSERT(reporter, matrix.invert(&matrix));
p1.transform(matrix, NULL);
SkRect pBounds = p.getBounds();
SkRect p1Bounds = p1.getBounds();
REPORTER_ASSERT(reporter, SkScalarNearlyEqual(pBounds.fLeft, p1Bounds.fLeft));
REPORTER_ASSERT(reporter, SkScalarNearlyEqual(pBounds.fTop, p1Bounds.fTop));
REPORTER_ASSERT(reporter, SkScalarNearlyEqual(pBounds.fRight, p1Bounds.fRight));
REPORTER_ASSERT(reporter, SkScalarNearlyEqual(pBounds.fBottom, p1Bounds.fBottom));
}
matrix.reset();
matrix.setPerspX(SkScalarToPersp(4));
p.transform(matrix, &p1);
REPORTER_ASSERT(reporter, matrix.invert(&matrix));
p1.transform(matrix, NULL);
SkRect pBounds = p.getBounds();
SkRect p1Bounds = p1.getBounds();
REPORTER_ASSERT(reporter, SkScalarNearlyEqual(pBounds.fLeft, p1Bounds.fLeft));
REPORTER_ASSERT(reporter, SkScalarNearlyEqual(pBounds.fTop, p1Bounds.fTop));
REPORTER_ASSERT(reporter, SkScalarNearlyEqual(pBounds.fRight, p1Bounds.fRight));
REPORTER_ASSERT(reporter, SkScalarNearlyEqual(pBounds.fBottom, p1Bounds.fBottom));
matrix.reset();
p.reset();
p.addCircle(0, 0, 1, SkPath::kCW_Direction);
p.transform(matrix, &p1);
REPORTER_ASSERT(reporter, p1.cheapIsDirection(SkPath::kCW_Direction));
matrix.setScaleX(-1);
p.transform(matrix, &p1);
REPORTER_ASSERT(reporter, p1.cheapIsDirection(SkPath::kCCW_Direction));
matrix.setAll(1, 1, 0, 1, 1, 0, 0, 0, 1);
p.transform(matrix, &p1);
REPORTER_ASSERT(reporter, p1.cheapIsDirection(SkPath::kUnknown_Direction));
{
SkMatrix matrix;
matrix.reset();
SkPath p1;
p1.moveTo(SkPoint::Make(0, 0));
p.transform(matrix, &p1);
REPORTER_ASSERT(reporter, p1.cheapIsDirection(SkPath::kCW_Direction));
}
{
SkMatrix matrix;
matrix.reset();
matrix.setScaleX(-1);
SkPath p1;
p1.moveTo(SkPoint::Make(0, 0)); // Make p1 unique (i.e., not empty path)
p.transform(matrix, &p1);
REPORTER_ASSERT(reporter, p1.cheapIsDirection(SkPath::kCCW_Direction));
}
{
SkMatrix matrix;
matrix.setAll(1, 1, 0, 1, 1, 0, 0, 0, 1);
SkPath p1;
p1.moveTo(SkPoint::Make(0, 0)); // Make p1 unique (i.e., not empty path)
p.transform(matrix, &p1);
REPORTER_ASSERT(reporter, p1.cheapIsDirection(SkPath::kUnknown_Direction));
}
}
static void test_zero_length_paths(skiatest::Reporter* reporter) {