DNC - JSON of flattenables, with field names.

src/core/SkPictureData.cpp

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #include <new>
 #include "SkImageGenerator.h"
 #include "SkPictureData.h"
 #include "SkPictureRecord.h"
@@ skipping 132 matching lines @@
             size_t len = strlen(name);
             size += SkWStream::SizeOfPackedUInt(len);
             size += len;
         }
     }
 
     return size;
 }
 
 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) {
     stream->write32(tag);
     stream->write32(SkToU32(size));
 }
 
 void SkPictureData::WriteFactories(SkWStream* stream, const SkFactorySet& rec) {
     int count = rec.count();
 
@@ skipping 35 matching lines @@
         array[i]->serialize(stream);
     }
 }
 
 void SkPictureData::flattenToBuffer(SkWriteBuffer& buffer) const {
     int i, n;
 
     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]);
         }
     }
 
     if (fTextBlobCount > 0) {
         write_tag_size(buffer, SK_PICT_TEXTBLOB_BUFFER_TAG, fTextBlobCount);
         for (i = 0; i  < fTextBlobCount; ++i) {
             fTextBlobRefs[i]->flatten(buffer);
         }
     }
 
     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]);
         }
     }
 }
 
 void SkPictureData::serialize(SkWStream* stream,
                               SkPixelSerializer* pixelSerializer,
                               SkRefCntSet* topLevelTypeFaceSet) const {
     // This can happen at pretty much any time, so might as well do it first.
     write_tag_size(stream, SK_PICT_READER_TAG, fOpData->size());
     stream->write(fOpData->bytes(), fOpData->size());
@@ skipping 40 matching lines @@
         for (int i = 0; i < fPictureCount; i++) {
             fPictureRefs[i]->serialize(stream, pixelSerializer, typefaceSet);
         }
     }
 
     stream->write32(SK_PICT_EOF_TAG);
 }
 
 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);
         for (int i = 0; i < fPictureCount; i++) {
             fPictureRefs[i]->flatten(buffer);
         }
     }
 
     // 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);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 /**
  *  Return the corresponding SkReadBuffer flags, given a set of
  *  SkPictInfo flags.
  */
 static uint32_t pictInfoFlagsToReadBufferFlags(uint32_t pictInfoFlags) {
     static const struct {
@@ skipping 301 matching lines @@
     } else {
         return this->suitableForGpuRasterization(nullptr, reason);
     }
 }
 
 bool SkPictureData::suitableForLayerOptimization() const {
     return fContentInfo.numLayers() > 0;
 }
 #endif
 ///////////////////////////////////////////////////////////////////////////////