DNC - JSON of flattenables, with field names.

src/core/SkPicture.cpp

 /*
  * Copyright 2007 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkAtomics.h"
 #include "SkImageGenerator.h"
 #include "SkMessageBus.h"
@@ skipping 189 matching lines @@
         data->serialize(stream, pixelSerializer, typefaceSet);
     } else {
         stream->writeBool(false);
     }
 }
 
 void SkPicture::flatten(SkWriteBuffer& buffer) const {
     SkPictInfo info = this->createHeader();
     SkAutoTDelete<SkPictureData> data(this->backport());
 
-    buffer.writeByteArray(&info.fMagic, sizeof(info.fMagic));
-    buffer.writeUInt(info.fVersion);
-    buffer.writeRect(info.fCullRect);
-    buffer.writeUInt(info.fFlags);
+    buffer.writeByteArray("fMagic", &info.fMagic, sizeof(info.fMagic));
+    buffer.writeUInt("fVersion", info.fVersion);
+    buffer.writeRect("fCullRect", info.fCullRect);
+    buffer.writeUInt("fFlags", info.fFlags);
     if (data) {
-        buffer.writeBool(true);
+        buffer.writeBool("dataValid", true);
         data->flatten(buffer);
     } else {
-        buffer.writeBool(false);
+        buffer.writeBool("dataValid", false);
     }
 }
 
 bool SkPicture::suitableForGpuRasterization(GrContext*, const char** whyNot) const {
     if (this->numSlowPaths() > 5) {
         if (whyNot) { *whyNot = "Too many slow paths (either concave or dashed)."; }
         return false;
     }
     return true;
 }
 
 // Global setting to disable security precautions for serialization.
 void SkPicture::SetPictureIOSecurityPrecautionsEnabled_Dangerous(bool set) {
     g_AllPictureIOSecurityPrecautionsEnabled = set;
 }
 
 bool SkPicture::PictureIOSecurityPrecautionsEnabled() {
     return g_AllPictureIOSecurityPrecautionsEnabled;
 }