DNC - JSON of flattenables, with field names.

src/core/SkPicture.cpp

Index: src/core/SkPicture.cpp
diff --git a/src/core/SkPicture.cpp b/src/core/SkPicture.cpp
index dfedd141db0f85a08b5c2e1bffb62fe95c83e80c..b4a6375c051322d2d3cb553c9d9fec920b30d7c6 100644
--- a/src/core/SkPicture.cpp
+++ b/src/core/SkPicture.cpp
@@ -207,15 +207,15 @@ 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);
     }
 }