Support serialization in SkRecord-backed SkPictures.

dm/DMUtil.cpp

 #include "DMUtil.h"
 
 #include "SkColorPriv.h"
 #include "SkPicture.h"
 #include "SkPictureRecorder.h"
 
 namespace DM {
 
 SkString UnderJoin(const char* a, const char* b) {
     SkString s;
     s.appendf("%s_%s", a, b);
     return s;
 }
 
 SkString FileToTaskName(SkString filename) {
     for (size_t i = 0; i < filename.size(); i++) {
         if ('_' == filename[i]) { filename[i] = '-'; }
         if ('.' == filename[i]) { filename[i] = '_'; }
     }
     return filename;
 }
 
-SkPicture* RecordPicture(skiagm::GM* gm, uint32_t recordFlags, SkBBHFactory* factory) {
-    const SkISize size = gm->getISize();
+SkPicture* RecordPicture(skiagm::GM* gm, SkBBHFactory* factory, bool skr) {
+    const int w = gm->getISize().width(),
+              h = gm->getISize().height();
     SkPictureRecorder recorder;
-    SkCanvas* canvas = recorder.beginRecording(size.width(), size.height(), factory, recordFlags);
+
+    SkCanvas* canvas = skr ? recorder.EXPERIMENTAL_beginRecording(w, h, factory)
+                           : recorder.             beginRecording(w, h, factory);
     canvas->concat(gm->getInitialTransform());
     gm->draw(canvas);
     canvas->flush();
     return recorder.endRecording();
 }
 
 void AllocatePixels(SkColorType ct, int width, int height, SkBitmap* bitmap) {
     bitmap->allocPixels(SkImageInfo::Make(width, height, ct, kPremul_SkAlphaType));
     bitmap->eraseColor(0x00000000);
 }
 
 void AllocatePixels(const SkBitmap& reference, SkBitmap* bitmap) {
     AllocatePixels(reference.colorType(), reference.width(), reference.height(), bitmap);
 }
 
-void DrawPicture(SkPicture* picture, SkBitmap* bitmap) {
-    SkASSERT(picture != NULL);
+void DrawPicture(const SkPicture& picture, SkBitmap* bitmap) {
     SkASSERT(bitmap != NULL);
     SkCanvas canvas(*bitmap);
-    canvas.drawPicture(picture);
+    canvas.drawPicture(&picture);
     canvas.flush();
 }
 
 static void unpack_565(uint16_t pixel, unsigned* r, unsigned* g, unsigned* b) {
     *r = SkGetPackedR16(pixel);
     *g = SkGetPackedG16(pixel);
     *b = SkGetPackedB16(pixel);
 }
 
 // Returns |a-b|.
@@ skipping 36 matching lines @@
 
 bool BitmapsEqual(const SkBitmap& a, const SkBitmap& b) {
     if (a.info() != b.info()) {
         return false;
     }
     const SkAutoLockPixels lockA(a), lockB(b);
     return 0 == memcmp(a.getPixels(), b.getPixels(), a.getSize());
 }
 
 }  // namespace DM