wip for drawables

tests/RecordDrawTest.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "Test.h"
 #include "RecordTestUtils.h"
 
@@ skipping 23 matching lines @@
     // Record two commands.
     SkRecord record;
     SkRecorder recorder(&record, W, H);
     recorder.drawRect(SkRect::MakeWH(200, 300), SkPaint());
     recorder.clipRect(SkRect::MakeWH(100, 200));
 
     SkRecord rerecord;
     SkRecorder canvas(&rerecord, W, H);
 
     JustOneDraw callback;
-    SkRecordDraw(record, &canvas, NULL/*bbh*/, &callback);
+    SkRecordDraw(record, &canvas, NULL, 0, NULL/*bbh*/, &callback);
 
     REPORTER_ASSERT(r, 3 == rerecord.count());
     assert_type<SkRecords::Save>    (r, rerecord, 0);
     assert_type<SkRecords::DrawRect>(r, rerecord, 1);
     assert_type<SkRecords::Restore> (r, rerecord, 2);
 }
 
 DEF_TEST(RecordDraw_Unbalanced, r) {
     SkRecord record;
     SkRecorder recorder(&record, W, H);
     recorder.save();  // We won't balance this, but SkRecordDraw will for us.
 
     SkRecord rerecord;
     SkRecorder canvas(&rerecord, W, H);
-    SkRecordDraw(record, &canvas, NULL/*bbh*/, NULL/*callback*/);
+    SkRecordDraw(record, &canvas, NULL, 0, NULL/*bbh*/, NULL/*callback*/);
 
     REPORTER_ASSERT(r, 4 == rerecord.count());
     assert_type<SkRecords::Save>    (r, rerecord, 0);
     assert_type<SkRecords::Save>    (r, rerecord, 1);
     assert_type<SkRecords::Restore> (r, rerecord, 2);
     assert_type<SkRecords::Restore> (r, rerecord, 3);
 }
 
 DEF_TEST(RecordDraw_SetMatrixClobber, r) {
     // Set up an SkRecord that just scales by 2x,3x.
     SkRecord scaleRecord;
     SkRecorder scaleCanvas(&scaleRecord, W, H);
     SkMatrix scale;
     scale.setScale(2, 3);
     scaleCanvas.setMatrix(scale);
 
     // Set up an SkRecord with an initial +20, +20 translate.
     SkRecord translateRecord;
     SkRecorder translateCanvas(&translateRecord, W, H);
     SkMatrix translate;
     translate.setTranslate(20, 20);
     translateCanvas.setMatrix(translate);
 
-    SkRecordDraw(scaleRecord, &translateCanvas, NULL/*bbh*/, NULL/*callback*/);
+    SkRecordDraw(scaleRecord, &translateCanvas, NULL, 0, NULL/*bbh*/, NULL/*callback*/);
     REPORTER_ASSERT(r, 4 == translateRecord.count());
     assert_type<SkRecords::SetMatrix>(r, translateRecord, 0);
     assert_type<SkRecords::Save>     (r, translateRecord, 1);
     assert_type<SkRecords::SetMatrix>(r, translateRecord, 2);
     assert_type<SkRecords::Restore>  (r, translateRecord, 3);
 
     // When we look at translateRecord now, it should have its first +20,+20 translate,
     // then a 2x,3x scale that's been concatted with that +20,+20 translate.
     const SkRecords::SetMatrix* setMatrix;
     setMatrix = assert_type<SkRecords::SetMatrix>(r, translateRecord, 0);
@@ skipping 89 matching lines @@
     SkPaint p;
 
     SkRecord record;
     SkRecorder recorder(&record, kWidth, kHeight);
     recorder.drawRect(r1, p);
     recorder.drawRect(r2, p);
     recorder.drawRect(r3, p);
 
     SkRecord rerecord;
     SkRecorder canvas(&rerecord, kWidth, kHeight);
-    SkRecordPartialDraw(record, &canvas, r1, 1, 2, SkMatrix::I()); // replay just drawRect of r2
+    SkRecordPartialDraw(record, &canvas, NULL, 0, r1, 1, 2, SkMatrix::I()); // replay just drawRect of r2
 
     REPORTER_ASSERT(r, 3 == rerecord.count());
     assert_type<SkRecords::Save>     (r, rerecord, 0);
     assert_type<SkRecords::DrawRect> (r, rerecord, 1);
     assert_type<SkRecords::Restore>  (r, rerecord, 2);
 
     const SkRecords::DrawRect* drawRect = assert_type<SkRecords::DrawRect>(r, rerecord, 1);
     REPORTER_ASSERT(r, drawRect->rect == r2);
 }
 
 // Check that clears are converted to drawRects
 DEF_TEST(RecordDraw_PartialClear, r) {
     static const int kWidth = 10, kHeight = 10;
 
     SkRect rect = { 0, 0, kWidth, kHeight };
 
     SkRecord record;
     SkRecorder recorder(&record, kWidth, kHeight);
     recorder.clear(SK_ColorRED);
 
     SkRecord rerecord;
     SkRecorder canvas(&rerecord, kWidth, kHeight);
-    SkRecordPartialDraw(record, &canvas, rect, 0, 1, SkMatrix::I()); // replay just the clear
+    SkRecordPartialDraw(record, &canvas, NULL, 0, rect, 0, 1, SkMatrix::I()); // replay just the clear
 
     REPORTER_ASSERT(r, 3 == rerecord.count());
     assert_type<SkRecords::Save>    (r, rerecord, 0);
     assert_type<SkRecords::DrawRect>(r, rerecord, 1);
     assert_type<SkRecords::Restore> (r, rerecord, 2);
 
     const SkRecords::DrawRect* drawRect = assert_type<SkRecords::DrawRect>(r, rerecord, 1);
     REPORTER_ASSERT(r, drawRect->rect == rect);
     REPORTER_ASSERT(r, drawRect->paint.getColor() == SK_ColorRED);
 }
@@ skipping 85 matching lines @@
     SkAutoTUnref<SkSurface> surface(SkSurface::NewRasterPMColor(10, 10));
     surface->getCanvas()->clear(SK_ColorGREEN);
     SkAutoTUnref<SkImage> image(surface->newImageSnapshot());
 
     SkCanvasMock canvas(10, 10);
 
     {
         SkRecord record;
         SkRecorder recorder(&record, 10, 10);
         recorder.drawImage(image, 0, 0);
-        SkRecordDraw(record, &canvas, 0, 0);
+        SkRecordDraw(record, &canvas, NULL, 0, NULL, 0);
     }
     REPORTER_ASSERT(r, canvas.fDrawImageCalled);
     canvas.resetTestValues();
 
     {
         SkRecord record;
         SkRecorder recorder(&record, 10, 10);
         recorder.drawImageRect(image, 0, SkRect::MakeWH(10, 10));
-        SkRecordDraw(record, &canvas, 0, 0);
+        SkRecordDraw(record, &canvas, NULL, 0, NULL, 0);
     }
     REPORTER_ASSERT(r, canvas.fDrawImageRectCalled);
 
 }