diff options
| author |  junov@chromium.org <junov@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-02-23 21:34:34 +0000 |
|---|---|---|
| committer | junov@chromium.org <junov@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-02-23 21:34:34 +0000 |
| commit | 87f982c80833eeebf541becec8e27b96c8c889f7 (patch) | |
| tree | d969da661578cdb6fe017ac6d4b87ca8842e3657 /tests | |
| parent | 809a2a9fb7deffacd9d2d37ba06a5202d90ee649 (diff) | |
Fix for crash in SkDeferredCanvas when optional SkPaint argument is NULL
BUG=http://code.google.com/p/skia/issues/detail?id=505
TEST=Canvas unit test
REVIEW=http://codereview.appspot.com/5699054/
git-svn-id: http://skia.googlecode.com/svn/trunk@3246 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/CanvasTest.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/tests/CanvasTest.cpp b/tests/CanvasTest.cpp index 099146f2dd..54b728b9a0 100644 --- a/tests/CanvasTest.cpp +++ b/tests/CanvasTest.cpp @@ -255,9 +255,7 @@ SIMPLE_TEST_STEP(DrawPointsPolygon, drawPoints(SkCanvas::kPolygon_PointMode, kTestPointCount, kTestPoints, kTestPaint)); SIMPLE_TEST_STEP(DrawRect, drawRect(kTestRect, kTestPaint)); SIMPLE_TEST_STEP(DrawPath, drawPath(kTestPath, kTestPaint)); -// The following test step is commented-out because it crashes SkDeferredCanvas -// Issue: http://code.google.com/p/skia/issues/detail?id=505 -//SIMPLE_TEST_STEP(DrawBitmap, drawBitmap(kTestBitmap, 0, 0)); +SIMPLE_TEST_STEP(DrawBitmap, drawBitmap(kTestBitmap, 0, 0)); SIMPLE_TEST_STEP(DrawBitmapPaint, drawBitmap(kTestBitmap, 0, 0, &kTestPaint)); SIMPLE_TEST_STEP(DrawBitmapRect, drawBitmapRect(kTestBitmap, NULL, kTestRect, NULL)); @@ -273,9 +271,7 @@ SIMPLE_TEST_STEP(DrawBitmapNine, drawBitmapNine(kTestBitmap, kTestIRect, kTestRect, NULL)); SIMPLE_TEST_STEP(DrawBitmapNinePaint, drawBitmapNine(kTestBitmap, kTestIRect, kTestRect, &kTestPaint)); -// The following test step is commented-out because it crashes SkDeferredCanvas -// Issue: http://code.google.com/p/skia/issues/detail?id=505 -//SIMPLE_TEST_STEP(DrawSprite, drawSprite(kTestBitmap, 0, 0, NULL)); +SIMPLE_TEST_STEP(DrawSprite, drawSprite(kTestBitmap, 0, 0, NULL)); SIMPLE_TEST_STEP(DrawSpritePaint, drawSprite(kTestBitmap, 0, 0, &kTestPaint)); SIMPLE_TEST_STEP(DrawText, drawText(kTestText.c_str(), kTestText.size(), 0, 1, kTestPaint)); |