DNC - JSON of flattenables, with field names.

src/effects/SkLightingImageFilter.cpp

Index: src/effects/SkLightingImageFilter.cpp
diff --git a/src/effects/SkLightingImageFilter.cpp b/src/effects/SkLightingImageFilter.cpp
index 7f0e3eab4b8584d10eccb25e640ed80efb8e98ae..0779b991e25808a7cb1a6a80c41dae51dcb463c3 100644
--- a/src/effects/SkLightingImageFilter.cpp
+++ b/src/effects/SkLightingImageFilter.cpp
@@ -326,9 +326,9 @@ SkPoint3 readPoint3(SkReadBuffer& buffer) {
 };
 
 void writePoint3(const SkPoint3& point, SkWriteBuffer& buffer) {
-    buffer.writeScalar(point.fX);
-    buffer.writeScalar(point.fY);
-    buffer.writeScalar(point.fZ);
+    buffer.writeScalar("fX", point.fX);
+    buffer.writeScalar("fY", point.fY);
+    buffer.writeScalar("fZ", point.fZ);
 };
 
 enum BoundaryMode {
@@ -1029,10 +1029,10 @@ protected:
     void onFlattenLight(SkWriteBuffer& buffer) const override {
         writePoint3(fLocation, buffer);
         writePoint3(fTarget, buffer);
-        buffer.writeScalar(fSpecularExponent);
-        buffer.writeScalar(fCosOuterConeAngle);
-        buffer.writeScalar(fCosInnerConeAngle);
-        buffer.writeScalar(fConeScale);
+        buffer.writeScalar("fSpecularExponent", fSpecularExponent);
+        buffer.writeScalar("fCosOuterConeAngle", fCosOuterConeAngle);
+        buffer.writeScalar("fCosInnerConeAngle", fCosInnerConeAngle);
+        buffer.writeScalar("fConeScale", fConeScale);
         writePoint3(fS, buffer);
     }
 
@@ -1073,7 +1073,7 @@ const SkScalar SkSpotLight::kSpecularExponentMax = 128.0f;
 
 void SkImageFilterLight::flattenLight(SkWriteBuffer& buffer) const {
     // Write type first, then baseclass, then subclass.
-    buffer.writeInt(this->type());
+    buffer.writeInt("type", this->type());
     writePoint3(fColor, buffer);
     this->onFlattenLight(buffer);
 }
@@ -1188,7 +1188,7 @@ sk_sp<SkImageFilter> SkLightingImageFilter::MakeSpotLitSpecular(const SkPoint3&
 void SkLightingImageFilter::flatten(SkWriteBuffer& buffer) const {
     this->INHERITED::flatten(buffer);
     fLight->flattenLight(buffer);
-    buffer.writeScalar(fSurfaceScale * 255);
+    buffer.writeScalar("fSurfaceScale", fSurfaceScale * 255);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -1232,7 +1232,7 @@ sk_sp<SkFlattenable> SkDiffuseLightingImageFilter::CreateProc(SkReadBuffer& buff
 
 void SkDiffuseLightingImageFilter::flatten(SkWriteBuffer& buffer) const {
     this->INHERITED::flatten(buffer);
-    buffer.writeScalar(fKD);
+    buffer.writeScalar("fKD", fKD);
 }
 
 sk_sp<SkSpecialImage> SkDiffuseLightingImageFilter::onFilterImage(SkSpecialImage* source,
@@ -1396,8 +1396,8 @@ sk_sp<SkFlattenable> SkSpecularLightingImageFilter::CreateProc(SkReadBuffer& buf
 
 void SkSpecularLightingImageFilter::flatten(SkWriteBuffer& buffer) const {
     this->INHERITED::flatten(buffer);
-    buffer.writeScalar(fKS);
-    buffer.writeScalar(fShininess);
+    buffer.writeScalar("fKS", fKS);
+    buffer.writeScalar("fShininess", fShininess);
 }
 
 sk_sp<SkSpecialImage> SkSpecularLightingImageFilter::onFilterImage(SkSpecialImage* source,