DNC - JSON of flattenables, with field names.

src/core/SkBitmap.cpp

 /*
  * Copyright 2008 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 "SkBitmap.h"
 #include "SkColorPriv.h"
@@ skipping 1082 matching lines @@
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 static void write_raw_pixels(SkWriteBuffer* buffer, const SkPixmap& pmap) {
     const SkImageInfo& info = pmap.info();
     const size_t snugRB = info.width() * info.bytesPerPixel();
     const char* src = (const char*)pmap.addr();
     const size_t ramRB = pmap.rowBytes();
 
-    buffer->write32(SkToU32(snugRB));
+    buffer->write32("snugRB", SkToU32(snugRB));
     info.flatten(*buffer);
 
     const size_t size = snugRB * info.height();
     SkAutoTMalloc<char> storage(size);
     char* dst = storage.get();
     for (int y = 0; y < info.height(); ++y) {
         memcpy(dst, src, snugRB);
         dst += snugRB;
         src += ramRB;
     }
-    buffer->writeByteArray(storage.get(), size);
+    buffer->writeByteArray("storage", storage.get(), size);
 
     const SkColorTable* ct = pmap.ctable();
     if (kIndex_8_SkColorType == info.colorType() && ct) {
-        buffer->writeBool(true);
+        buffer->writeBool("hasColorTable", true);
         ct->writeToBuffer(*buffer);
     } else {
-        buffer->writeBool(false);
+        buffer->writeBool("hasColorTable", false);
     }
 }
 
 void SkBitmap::WriteRawPixels(SkWriteBuffer* buffer, const SkBitmap& bitmap) {
     const SkImageInfo info = bitmap.info();
     if (0 == info.width() || 0 == info.height() || nullptr == bitmap.pixelRef()) {
-        buffer->writeUInt(0); // instead of snugRB, signaling no pixels
+        buffer->writeUInt("snugRB", 0); // instead of snugRB, signaling no pixels
         return;
     }
 
     SkAutoPixmapUnlock result;
     if (!bitmap.requestLock(&result)) {
-        buffer->writeUInt(0); // instead of snugRB, signaling no pixels
+        buffer->writeUInt("snugRB", 0); // instead of snugRB, signaling no pixels
         return;
     }
 
     write_raw_pixels(buffer, result.pixmap());
 }
 
 bool SkBitmap::ReadRawPixels(SkReadBuffer* buffer, SkBitmap* bitmap) {
     const size_t snugRB = buffer->readUInt();
     if (0 == snugRB) {  // no pixels
         return false;
@@ skipping 204 matching lines @@
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifdef SK_DEBUG
 void SkImageInfo::validate() const {
     SkASSERT(fWidth >= 0);
     SkASSERT(fHeight >= 0);
     SkASSERT(SkColorTypeIsValid(fColorType));
     SkASSERT(SkAlphaTypeIsValid(fAlphaType));
 }
 #endif