DNC - JSON of flattenables, with field names.

src/core/SkShader.cpp

Index: src/core/SkShader.cpp
diff --git a/src/core/SkShader.cpp b/src/core/SkShader.cpp
index 0ed97b02239e3d9bc7b9f429d1c56ca97a301f59..a4c957eeb5163b2238d5f7262487a853ceb89970 100644
--- a/src/core/SkShader.cpp
+++ b/src/core/SkShader.cpp
@@ -55,9 +55,9 @@ SkShader::~SkShader() {
 void SkShader::flatten(SkWriteBuffer& buffer) const {
     this->INHERITED::flatten(buffer);
     bool hasLocalM = !fLocalMatrix.isIdentity();
-    buffer.writeBool(hasLocalM);
+    buffer.writeBool("hasLocalM", hasLocalM);
     if (hasLocalM) {
-        buffer.writeMatrix(fLocalMatrix);
+        buffer.writeMatrix("fLocalMatrix", fLocalMatrix);
     }
 }
 
@@ -269,7 +269,7 @@ sk_sp<SkFlattenable> SkColorShader::CreateProc(SkReadBuffer& buffer) {
 }
 
 void SkColorShader::flatten(SkWriteBuffer& buffer) const {
-    buffer.writeColor(fColor);
+    buffer.writeColor("fColor", fColor);
 }
 
 uint32_t SkColorShader::ColorShaderContext::getFlags() const {