| Index: tests/RecordDrawTest.cpp
|
| diff --git a/tests/RecordDrawTest.cpp b/tests/RecordDrawTest.cpp
|
| index c4dab84273bcecb926a2fdbed04c12afdc727d50..d830aea6e563c2b2b9c6441d0975a7e7102eb3c9 100644
|
| --- a/tests/RecordDrawTest.cpp
|
| +++ b/tests/RecordDrawTest.cpp
|
| @@ -16,6 +16,39 @@
|
|
|
| static const int W = 1920, H = 1080;
|
|
|
| +static void draw_pos_text_h(SkCanvas* canvas, const char* text, SkScalar y) {
|
| + const size_t len = strlen(text);
|
| + SkAutoTMalloc<SkScalar> xpos(len);
|
| + for (size_t i = 0; i < len; i++) {
|
| + xpos[i] = (SkScalar)i;
|
| + }
|
| + canvas->drawPosTextH(text, len, xpos, y, SkPaint());
|
| +}
|
| +
|
| +// Rerecord into another SkRecord using full SkCanvas semantics,
|
| +// tracking clips and allowing SkRecordDraw's quickReject() calls to work.
|
| +static void record_clipped(const SkRecord& record, SkRect clip, SkRecord* clipped) {
|
| + SkRecorder recorder(SkRecorder::kReadWrite_Mode, clipped, W, H);
|
| + recorder.clipRect(clip);
|
| + SkRecordDraw(record, &recorder);
|
| +}
|
| +
|
| +DEF_TEST(RecordDraw_PosTextHQuickReject, r) {
|
| + SkRecord record;
|
| + SkRecorder recorder(SkRecorder::kWriteOnly_Mode, &record, W, H);
|
| +
|
| + draw_pos_text_h(&recorder, "This will draw.", 20);
|
| + draw_pos_text_h(&recorder, "This won't.", 5000);
|
| +
|
| + SkRecordBoundDrawPosTextH(&record);
|
| +
|
| + SkRecord clipped;
|
| + record_clipped(record, SkRect::MakeLTRB(20, 20, 200, 200), &clipped);
|
| +
|
| + // clipRect and the first drawPosTextH.
|
| + REPORTER_ASSERT(r, 2 == clipped.count());
|
| +}
|
| +
|
| DEF_TEST(RecordDraw_Culling, r) {
|
| // Record these 7 drawing commands verbatim.
|
| SkRecord record;
|
| @@ -32,16 +65,11 @@ DEF_TEST(RecordDraw_Culling, r) {
|
| // Take a pass over to match up pushCulls and popCulls.
|
| SkRecordAnnotateCullingPairs(&record);
|
|
|
| - // Rerecord into another SkRecord using full SkCanvas semantics,
|
| - // tracking clips and allowing SkRecordDraw's quickReject() calls to work.
|
| - SkRecord rerecord;
|
| - SkRecorder rerecorder(SkRecorder::kReadWrite_Mode, &rerecord, W, H);
|
| // This clip intersects the outer cull, but allows us to quick reject the inner one.
|
| - rerecorder.clipRect(SkRect::MakeLTRB(20, 20, 200, 200));
|
| -
|
| - SkRecordDraw(record, &rerecorder);
|
| + SkRecord clipped;
|
| + record_clipped(record, SkRect::MakeLTRB(20, 20, 200, 200), &clipped);
|
|
|
| // We'll keep the clipRect call from above, and the outer two drawRects, and the push/pop pair.
|
| // If culling weren't working, we'd see 8 commands recorded here.
|
| - REPORTER_ASSERT(r, 5 == rerecord.count());
|
| + REPORTER_ASSERT(r, 5 == clipped.count());
|
| }
|
|
|