DNC - JSON of flattenables, with field names.

src/core/SkPictureData.cpp

Index: src/core/SkPictureData.cpp
diff --git a/src/core/SkPictureData.cpp b/src/core/SkPictureData.cpp
index 92aa2410ad824edb52904262b7008352d9449640..16e47907173749200bc0f9777cd6230ee7eee6b4 100644
--- a/src/core/SkPictureData.cpp
+++ b/src/core/SkPictureData.cpp
@@ -150,8 +150,8 @@ static size_t compute_chunk_size(SkFlattenable::Factory* array, int count) {
 }
 
 static void write_tag_size(SkWriteBuffer& buffer, uint32_t tag, size_t size) {
-    buffer.writeUInt(tag);
-    buffer.writeUInt(SkToU32(size));
+    buffer.writeUInt("tag", tag);
+    buffer.writeUInt("size", SkToU32(size));
 }
 
 static void write_tag_size(SkWStream* stream, uint32_t tag, size_t size) {
@@ -207,22 +207,22 @@ void SkPictureData::flattenToBuffer(SkWriteBuffer& buffer) const {
     if ((n = fBitmaps.count()) > 0) {
         write_tag_size(buffer, SK_PICT_BITMAP_BUFFER_TAG, n);
         for (i = 0; i < n; i++) {
-            buffer.writeBitmap(fBitmaps[i]);
+            buffer.writeBitmap("fBitmap", fBitmaps[i]);
         }
     }
 
     if ((n = fPaints.count()) > 0) {
         write_tag_size(buffer, SK_PICT_PAINT_BUFFER_TAG, n);
         for (i = 0; i < n; i++) {
-            buffer.writePaint(fPaints[i]);
+            buffer.writePaint("fPaint", fPaints[i]);
         }
     }
 
     if ((n = fPaths.count()) > 0) {
         write_tag_size(buffer, SK_PICT_PATH_BUFFER_TAG, n);
-        buffer.writeInt(n);
+        buffer.writeInt("pathCount", n);
         for (int i = 0; i < n; i++) {
-            buffer.writePath(fPaths[i]);
+            buffer.writePath("fPath", fPaths[i]);
         }
     }
 
@@ -236,7 +236,7 @@ void SkPictureData::flattenToBuffer(SkWriteBuffer& buffer) const {
     if (fImageCount > 0) {
         write_tag_size(buffer, SK_PICT_IMAGE_BUFFER_TAG, fImageCount);
         for (i = 0; i  < fImageCount; ++i) {
-            buffer.writeImage(fImageRefs[i]);
+            buffer.writeImage("fImageRef", fImageRefs[i]);
         }
     }
 }
@@ -297,7 +297,7 @@ void SkPictureData::serialize(SkWStream* stream,
 
 void SkPictureData::flatten(SkWriteBuffer& buffer) const {
     write_tag_size(buffer, SK_PICT_READER_TAG, fOpData->size());
-    buffer.writeByteArray(fOpData->bytes(), fOpData->size());
+    buffer.writeByteArray("fOpData", fOpData->bytes(), fOpData->size());
 
     if (fPictureCount > 0) {
         write_tag_size(buffer, SK_PICT_PICTURE_TAG, fPictureCount);
@@ -308,7 +308,7 @@ void SkPictureData::flatten(SkWriteBuffer& buffer) const {
 
     // Write this picture playback's data into a writebuffer
     this->flattenToBuffer(buffer);
-    buffer.write32(SK_PICT_EOF_TAG);
+    buffer.write32("eofTag", SK_PICT_EOF_TAG);
 }
 
 ///////////////////////////////////////////////////////////////////////////////