aboutsummaryrefslogtreecommitdiffhomepage
path: root/tests
diff options
context:
space:
mode:
authorGravatar reed <reed@google.com>2015-08-06 10:02:53 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2015-08-06 10:02:53 -0700
commite47829b6b1eeb6b0c97ccb3df3016d197046824c (patch)
treefb90751c17490f47febe44cabf2c4cf1fa249a48 /tests
parentfb1141ae1db2ffce479bc46413b008d31cf9d3cc (diff)
flag to use const& instead of const* for src-rect
Diffstat (limited to 'tests')
-rw-r--r--tests/PictureTest.cpp4
-rw-r--r--tests/RecordDrawTest.cpp2
-rw-r--r--tests/RecorderTest.cpp2
-rw-r--r--tests/SurfaceTest.cpp2
4 files changed, 5 insertions, 5 deletions
diff --git a/tests/PictureTest.cpp b/tests/PictureTest.cpp
index 34ccc91e87..bcfd9c479e 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->drawBitmapRect(bm, r, nullptr);
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, SkCanvas::kStrict_SrcRectConstraint);
+ canvas->drawBitmapRect(bitmap, rect, rect, &paint, SkCanvas::kStrict_SrcRectConstraint);
canvas->drawBitmapNine(bitmap, irect, rect, &paint);
canvas->drawSprite(bitmap, 1, 1);
}
diff --git a/tests/RecordDrawTest.cpp b/tests/RecordDrawTest.cpp
index 9bbf1d95af..da78296648 100644
--- a/tests/RecordDrawTest.cpp
+++ b/tests/RecordDrawTest.cpp
@@ -325,7 +325,7 @@ DEF_TEST(RecordDraw_drawImage, r){
{
SkRecord record;
SkRecorder recorder(&record, 10, 10);
- recorder.drawImageRect(image, 0, SkRect::MakeWH(10, 10));
+ recorder.drawImageRect(image, SkRect::MakeWH(10, 10), nullptr);
SkRecordDraw(record, &canvas, NULL, NULL, 0, NULL, 0);
}
REPORTER_ASSERT(r, canvas.fDrawImageRectCalled);
diff --git a/tests/RecorderTest.cpp b/tests/RecorderTest.cpp
index 829fe3e229..c41d634b44 100644
--- a/tests/RecorderTest.cpp
+++ b/tests/RecorderTest.cpp
@@ -98,7 +98,7 @@ DEF_TEST(Recorder_drawImage_takeReference, reporter) {
SkRecorder recorder(&record, 100, 100);
// DrawImageRect is supposed to take a reference
- recorder.drawImageRect(image.get(), 0, SkRect::MakeWH(100, 100));
+ recorder.drawImageRect(image.get(), SkRect::MakeWH(100, 100), nullptr);
REPORTER_ASSERT(reporter, !image->unique());
Tally tally;
diff --git a/tests/SurfaceTest.cpp b/tests/SurfaceTest.cpp
index 157ccf6c77..fac283d5b1 100644
--- a/tests/SurfaceTest.cpp
+++ b/tests/SurfaceTest.cpp
@@ -705,7 +705,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, testRect, nullptr))
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))