diff options
| author |  scroggo <scroggo@google.com> | 2015-07-17 05:57:34 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-07-17 05:57:34 -0700 |
| commit | 91110195a2eee170c11885da9d16f94b00a39f87 (patch) | |
| tree | 4dc22ce2b05e9cde0369d2f4d97bb18cd8d2f6aa /tests | |
| parent | ac66a8122b27c388cc74b3913d9a9be351a44e54 (diff) | |
Revert of guard to remove DrawBitmapRectFlags (patchset #1 id:1 of https://codereview.chromium.org/1235393003/)
Reason for revert:
breaking android framework build
Original issue's description:
> guard to remove DrawBitmapRectFlags
>
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/6fb0b6779e40ce05c20cf279f0ecff31fa3cd60d
TBR=fmalita@chromium.org,djsollen@google.com,reed@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review URL: https://codereview.chromium.org/1230823007
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/DrawBitmapRectTest.cpp | 2 | ||||
| -rw-r--r-- | tests/PictureTest.cpp | 8 | ||||
| -rw-r--r-- | tests/SurfaceTest.cpp | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/tests/DrawBitmapRectTest.cpp b/tests/DrawBitmapRectTest.cpp index 7d8798cc9b..e6d46a751d 100644 --- a/tests/DrawBitmapRectTest.cpp +++ b/tests/DrawBitmapRectTest.cpp @@ -299,7 +299,7 @@ DEF_TEST(DrawBitmapRect, reporter) { SkIRect srcR = { gWidth, 0, gWidth + 16, 16 }; SkRect dstR = { 0, 0, SkIntToScalar(16), SkIntToScalar(16) }; - canvas.drawBitmapRect(src, srcR, dstR, NULL); + canvas.drawBitmapRect(src, &srcR, dstR, NULL); // ensure that we draw nothing if srcR does not intersect the bitmap REPORTER_ASSERT(reporter, check_for_all_zeros(dst)); diff --git a/tests/PictureTest.cpp b/tests/PictureTest.cpp index a20ff2728e..ba66286350 100644 --- a/tests/PictureTest.cpp +++ b/tests/PictureTest.cpp @@ -690,7 +690,7 @@ DEF_TEST(PictureRecorder_replay, reporter) { make_bm(&bm, 10, 10, SK_ColorRED, true); r.offset(5.0f, 5.0f); - canvas->drawBitmapRect(bm, r); + canvas->drawBitmapRectToRect(bm, NULL, r); SkAutoTUnref<SkPicture> final(recorder.endRecording()); REPORTER_ASSERT(reporter, final->willPlayBackBitmaps()); @@ -1167,7 +1167,7 @@ static void draw_bitmaps(const SkBitmap bitmap, SkCanvas* canvas) { // Don't care what these record, as long as they're legal. canvas->drawBitmap(bitmap, 0.0f, 0.0f, &paint); - canvas->drawBitmapRect(bitmap, &rect, rect, &paint); + canvas->drawBitmapRectToRect(bitmap, &rect, rect, &paint, SkCanvas::kNone_DrawBitmapRectFlag); canvas->drawBitmapNine(bitmap, irect, rect, &paint); canvas->drawSprite(bitmap, 1, 1); } @@ -1197,8 +1197,8 @@ DEF_TEST(DontOptimizeSaveLayerDrawDrawRestore, reporter) { // This test is from crbug.com/344987. // The commands are: // saveLayer with paint that modifies alpha - // drawBitmapRect - // drawBitmapRect + // drawBitmapRectToRect + // drawBitmapRectToRect // restore // The bug was that this structure was modified so that: // - The saveLayer and restore were eliminated diff --git a/tests/SurfaceTest.cpp b/tests/SurfaceTest.cpp index b1e233fa3a..9d0c6459c1 100644 --- a/tests/SurfaceTest.cpp +++ b/tests/SurfaceTest.cpp @@ -691,7 +691,7 @@ static void TestSurfaceCopyOnWrite(skiatest::Reporter* reporter, SurfaceType sur EXPECT_COPY_ON_WRITE(drawRRect(testRRect, testPaint)) EXPECT_COPY_ON_WRITE(drawPath(testPath, testPaint)) EXPECT_COPY_ON_WRITE(drawBitmap(testBitmap, 0, 0)) - EXPECT_COPY_ON_WRITE(drawBitmapRect(testBitmap, testRect)) + EXPECT_COPY_ON_WRITE(drawBitmapRect(testBitmap, NULL, testRect)) EXPECT_COPY_ON_WRITE(drawBitmapNine(testBitmap, testIRect, testRect, NULL)) EXPECT_COPY_ON_WRITE(drawSprite(testBitmap, 0, 0, NULL)) EXPECT_COPY_ON_WRITE(drawText(testText.c_str(), testText.size(), 0, 1, testPaint)) |