From 274218ef0173ff6046f2258c703c1c83ea37c02f Mon Sep 17 00:00:00 2001 From: Mike Reed Date: Mon, 8 Jan 2018 15:05:02 -0500 Subject: move largest apis into private Related to https://skia-review.googlesource.com/c/skia/+/91860 Bug: skia: Change-Id: Ia8fd981b422bbab75541b078277d2e09e1fc9d41 Reviewed-on: https://skia-review.googlesource.com/91940 Reviewed-by: Brian Salomon --- tests/PictureTest.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'tests/PictureTest.cpp') diff --git a/tests/PictureTest.cpp b/tests/PictureTest.cpp index 9ecb08224e..714338f9d1 100644 --- a/tests/PictureTest.cpp +++ b/tests/PictureTest.cpp @@ -17,11 +17,12 @@ #include "SkImageEncoder.h" #include "SkImageGenerator.h" #include "SkMD5.h" +#include "SkMiniRecorder.h" #include "SkPaint.h" #include "SkPicture.h" #include "SkPictureRecorder.h" #include "SkPixelRef.h" -#include "SkMiniRecorder.h" +#include "SkRectPriv.h" #include "SkRRect.h" #include "SkRandom.h" #include "SkRecord.h" @@ -784,32 +785,32 @@ DEF_TEST(Picture_UpdatedCull_1, r) { SkRTreeFactory factory; SkPictureRecorder recorder; - auto canvas = recorder.beginRecording(SkRect::MakeLargest(), &factory); + auto canvas = recorder.beginRecording(SkRectPriv::MakeLargest(), &factory); canvas->drawRect(SkRect::MakeWH(20,20), SkPaint{}); auto pic = recorder.finishRecordingAsPicture(); REPORTER_ASSERT(r, pic->cullRect() == SkRect::MakeWH(20,20)); - canvas = recorder.beginRecording(SkRect::MakeLargest()); + canvas = recorder.beginRecording(SkRectPriv::MakeLargest()); canvas->drawRect(SkRect::MakeWH(20,20), SkPaint{}); pic = recorder.finishRecordingAsPicture(); - REPORTER_ASSERT(r, pic->cullRect() == SkRect::MakeLargest()); + REPORTER_ASSERT(r, pic->cullRect() == SkRectPriv::MakeLargest()); } DEF_TEST(Picture_UpdatedCull_2, r) { // Testing >1 draw exercises SkBigPicture. SkRTreeFactory factory; SkPictureRecorder recorder; - auto canvas = recorder.beginRecording(SkRect::MakeLargest(), &factory); + auto canvas = recorder.beginRecording(SkRectPriv::MakeLargest(), &factory); canvas->drawRect(SkRect::MakeWH(20,20), SkPaint{}); canvas->drawRect(SkRect::MakeWH(10,40), SkPaint{}); auto pic = recorder.finishRecordingAsPicture(); REPORTER_ASSERT(r, pic->cullRect() == SkRect::MakeWH(20,40)); - canvas = recorder.beginRecording(SkRect::MakeLargest()); + canvas = recorder.beginRecording(SkRectPriv::MakeLargest()); canvas->drawRect(SkRect::MakeWH(20,20), SkPaint{}); canvas->drawRect(SkRect::MakeWH(10,40), SkPaint{}); pic = recorder.finishRecordingAsPicture(); - REPORTER_ASSERT(r, pic->cullRect() == SkRect::MakeLargest()); + REPORTER_ASSERT(r, pic->cullRect() == SkRectPriv::MakeLargest()); } DEF_TEST(Picture_RecordsFlush, r) { -- cgit v1.2.3