DNC - JSON of flattenables, with field names.

src/core/SkPaint.cpp

Index: src/core/SkPaint.cpp
diff --git a/src/core/SkPaint.cpp b/src/core/SkPaint.cpp
index 123f20365e6ef2cf96a905e46681be48f684655d..6987fb9d9e1fb4355dc009e16cd2c840d1ddba08 100644
--- a/src/core/SkPaint.cpp
+++ b/src/core/SkPaint.cpp
@@ -1567,14 +1567,14 @@ static size_t fill_out_rec(const SkPaint& paint, SkScalerContext::Rec* rec,
     size_t descSize = sizeof(*rec);
 
     if (pe) {
-        peBuffer->writeFlattenable(pe);
+        peBuffer->writeFlattenable("pathEffect", pe);
         descSize += peBuffer->bytesWritten();
         entryCount += 1;
         rec->fMaskFormat = SkMask::kA8_Format;  // force antialiasing when we do the scan conversion
         // seems like we could support kLCD as well at this point...
     }
     if (mf) {
-        mfBuffer->writeFlattenable(mf);
+        mfBuffer->writeFlattenable("maskFilter", mf);
         descSize += mfBuffer->bytesWritten();
         entryCount += 1;
         rec->fMaskFormat = SkMask::kA8_Format;   // force antialiasing with maskfilters
@@ -1585,7 +1585,7 @@ static size_t fill_out_rec(const SkPaint& paint, SkScalerContext::Rec* rec,
         rec->ignorePreBlend();
     }
     if (ra) {
-        raBuffer->writeFlattenable(ra);
+        raBuffer->writeFlattenable("rasterizer", ra);
         descSize += raBuffer->bytesWritten();
         entryCount += 1;
         rec->fMaskFormat = SkMask::kA8_Format;  // force antialiasing when we do the scan conversion
@@ -1894,17 +1894,17 @@ void SkPaint::flatten(SkWriteBuffer& buffer) const {
     // now we're done with ptr and the (pre)reserved space. If we need to write
     // additional fields, use the buffer directly
     if (flatFlags & kHasTypeface_FlatFlag) {
-        buffer.writeTypeface(this->getTypeface());
+        buffer.writeTypeface("typeface", this->getTypeface());
     }
     if (flatFlags & kHasEffects_FlatFlag) {
-        buffer.writeFlattenable(this->getPathEffect());
-        buffer.writeFlattenable(this->getShader());
-        buffer.writeFlattenable(this->getXfermode());
-        buffer.writeFlattenable(this->getMaskFilter());
-        buffer.writeFlattenable(this->getColorFilter());
-        buffer.writeFlattenable(this->getRasterizer());
-        buffer.writeFlattenable(this->getLooper());
-        buffer.writeFlattenable(this->getImageFilter());
+        buffer.writeFlattenable("pathEffect", this->getPathEffect());
+        buffer.writeFlattenable("shader", this->getShader());
+        buffer.writeFlattenable("xferMode", this->getXfermode());
+        buffer.writeFlattenable("maskFilter", this->getMaskFilter());
+        buffer.writeFlattenable("colorFilter", this->getColorFilter());
+        buffer.writeFlattenable("rasterizer", this->getRasterizer());
+        buffer.writeFlattenable("looper", this->getLooper());
+        buffer.writeFlattenable("imageFilter", this->getImageFilter());
     }
 }