DNC - JSON of flattenables, with field names.

src/core/SkLightingShader.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkBitmapProcState.h"
 #include "SkColor.h"
 #include "SkEmptyShader.h"
@@ skipping 601 matching lines @@
     }
 
     return sk_make_sp<SkLightingShaderImpl>(diffuse, normal, lights, invNormRotation,
                                             &diffLocalM, &normLocalM);
 }
 
 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,
                                                    SkMatrix* normTotalInverse) const {
     SkMatrix total;
     total.setConcat(*rec.fMatrix, fNormLocalMatrix);
 
     const SkMatrix* m = &total;
     if (rec.fLocalMatrix) {
         total.setConcat(*m, *rec.fLocalMatrix);
@@ skipping 69 matching lines @@
                                             normLocalM);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_START(SkLightingShader)
     SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkLightingShaderImpl)
 SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_END
 
 ///////////////////////////////////////////////////////////////////////////////