DNC - JSON of flattenables, with field names.

src/core/SkImageInfo.cpp

 /*
  * Copyright 2010 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkImageInfo.h"
 #include "SkReadBuffer.h"
 #include "SkWriteBuffer.h"
@@ skipping 20 matching lines @@
     SkASSERT(0 == (packed >> 24));
     fProfileType = (SkColorProfileType)((packed >> 16) & 0xFF);
     fAlphaType = (SkAlphaType)((packed >> 8) & 0xFF);
     fColorType = (SkColorType)((packed >> 0) & 0xFF);
     buffer.validate(profile_type_is_valid(fProfileType) &&
                     alpha_type_is_valid(fAlphaType) &&
                     color_type_is_valid(fColorType));
 }
 
 void SkImageInfo::flatten(SkWriteBuffer& buffer) const {
-    buffer.write32(fWidth);
-    buffer.write32(fHeight);
+    buffer.write32("fWidth", fWidth);
+    buffer.write32("fHeight", fHeight);
 
     SkASSERT(0 == (fProfileType & ~0xFF));
     SkASSERT(0 == (fAlphaType & ~0xFF));
     SkASSERT(0 == (fColorType & ~0xFF));
     uint32_t packed = (fProfileType << 16) | (fAlphaType << 8) | fColorType;
-    buffer.write32(packed);
+    buffer.write32("packed", packed);
 }
 
 bool SkColorTypeValidateAlphaType(SkColorType colorType, SkAlphaType alphaType,
                                   SkAlphaType* canonical) {
     switch (colorType) {
         case kUnknown_SkColorType:
             alphaType = kUnknown_SkAlphaType;
             break;
         case kAlpha_8_SkColorType:
             if (kUnpremul_SkAlphaType == alphaType) {
@@ skipping 57 matching lines @@
     }
     // here x,y are either 0 or negative
     fPixels = ((char*)fPixels - y * fRowBytes - x * fInfo.bytesPerPixel());
     // the intersect may have shrunk info's logical size
     fInfo = fInfo.makeWH(srcR.width(), srcR.height());
     fX = srcR.x();
     fY = srcR.y();
 
     return true;
 }