DNC - JSON of flattenables, with field names.

src/core/SkLightingShader.cpp

Index: src/core/SkLightingShader.cpp
diff --git a/src/core/SkLightingShader.cpp b/src/core/SkLightingShader.cpp
index f37f664d9859a537ff1f30a2550c552a90b74680..3796d7485a98493474c9dcb204e203784b8fbba0 100644
--- a/src/core/SkLightingShader.cpp
+++ b/src/core/SkLightingShader.cpp
@@ -619,27 +619,27 @@ void SkLightingShaderImpl::flatten(SkWriteBuffer& buf) const {
     this->INHERITED::flatten(buf);
 
     bool hasNormLocalM = !fNormLocalMatrix.isIdentity();
-    buf.writeBool(hasNormLocalM);
+    buf.writeBool(SK_STRING_AND_VALUE(hasNormLocalM));
     if (hasNormLocalM) {
-        buf.writeMatrix(fNormLocalMatrix);
+        buf.writeMatrix(SK_STRING_AND_VALUE(fNormLocalMatrix));
     }
 
-    buf.writeBitmap(fDiffuseMap);
-    buf.writeBitmap(fNormalMap);
+    buf.writeBitmap(SK_STRING_AND_VALUE(fDiffuseMap));
+    buf.writeBitmap(SK_STRING_AND_VALUE(fNormalMap));
 
-    buf.writeInt(fLights->numLights());
+    buf.writeInt("numLights", fLights->numLights());
     for (int l = 0; l < fLights->numLights(); ++l) {
         const SkLight& light = fLights->light(l);
 
         bool isAmbient = SkLight::kAmbient_LightType == light.type();
 
-        buf.writeBool(isAmbient);
-        buf.writeScalarArray(&light.color().fX, 3);
+        buf.writeBool(SK_STRING_AND_VALUE(isAmbient));
+        buf.writeScalarArray("lightColor", &light.color().fX, 3);
         if (!isAmbient) {
-            buf.writeScalarArray(&light.dir().fX, 3);
+            buf.writeScalarArray("lightDir", &light.dir().fX, 3);
         }
     }
-    buf.writePoint(fInvNormRotation);
+    buf.writePoint(SK_STRING_AND_VALUE(fInvNormRotation));
 }
 
 bool SkLightingShaderImpl::computeNormTotalInverse(const ContextRec& rec,