DNC - JSON of flattenables, with field names.

src/effects/Sk2DPathEffect.cpp

 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "Sk2DPathEffect.h"
 #include "SkReadBuffer.h"
@@ skipping 52 matching lines @@
 }
 
 void Sk2DPathEffect::begin(const SkIRect& uvBounds, SkPath* dst) const {}
 void Sk2DPathEffect::next(const SkPoint& loc, int u, int v, SkPath* dst) const {}
 void Sk2DPathEffect::end(SkPath* dst) const {}
 
 ///////////////////////////////////////////////////////////////////////////////
 
 void Sk2DPathEffect::flatten(SkWriteBuffer& buffer) const {
     this->INHERITED::flatten(buffer);
-    buffer.writeMatrix(fMatrix);
+    buffer.writeMatrix("fMatrix", fMatrix);
 }
 
 #ifndef SK_IGNORE_TO_STRING
 void Sk2DPathEffect::toString(SkString* str) const {
     str->appendf("(matrix: %.2f %.2f %.2f %.2f %.2f %.2f %.2f %.2f %.2f)",
             fMatrix[SkMatrix::kMScaleX], fMatrix[SkMatrix::kMSkewX],  fMatrix[SkMatrix::kMTransX],
             fMatrix[SkMatrix::kMSkewY],  fMatrix[SkMatrix::kMScaleY], fMatrix[SkMatrix::kMTransY],
             fMatrix[SkMatrix::kMPersp0], fMatrix[SkMatrix::kMPersp1], fMatrix[SkMatrix::kMPersp2]);
 }
 #endif
@@ skipping 23 matching lines @@
 }
 
 sk_sp<SkFlattenable> SkLine2DPathEffect::CreateProc(SkReadBuffer& buffer) {
     SkMatrix matrix;
     buffer.readMatrix(&matrix);
     SkScalar width = buffer.readScalar();
     return SkLine2DPathEffect::Make(width, matrix);
 }
 
 void SkLine2DPathEffect::flatten(SkWriteBuffer &buffer) const {
-    buffer.writeMatrix(this->getMatrix());
-    buffer.writeScalar(fWidth);
+    buffer.writeMatrix("fMatrix", this->getMatrix());
+    buffer.writeScalar("fWidth", fWidth);
 }
 
 
 #ifndef SK_IGNORE_TO_STRING
 void SkLine2DPathEffect::toString(SkString* str) const {
     str->appendf("SkLine2DPathEffect: (");
     this->INHERITED::toString(str);
     str->appendf("width: %f", fWidth);
     str->appendf(")");
 }
 #endif
 
 ///////////////////////////////////////////////////////////////////////////////
 
 SkPath2DPathEffect::SkPath2DPathEffect(const SkMatrix& m, const SkPath& p)
     : INHERITED(m), fPath(p) {
 }
 
 sk_sp<SkFlattenable> SkPath2DPathEffect::CreateProc(SkReadBuffer& buffer) {
     SkMatrix matrix;
     buffer.readMatrix(&matrix);
     SkPath path;
     buffer.readPath(&path);
     return SkPath2DPathEffect::Make(matrix, path);
 }
 
 void SkPath2DPathEffect::flatten(SkWriteBuffer& buffer) const {
-    buffer.writeMatrix(this->getMatrix());
-    buffer.writePath(fPath);
+    buffer.writeMatrix("fMatrix", this->getMatrix());
+    buffer.writePath("fPath", fPath);
 }
 
 void SkPath2DPathEffect::next(const SkPoint& loc, int u, int v,
                               SkPath* dst) const {
     dst->addPath(fPath, loc.fX, loc.fY);
 }
 
 #ifndef SK_IGNORE_TO_STRING
 void SkPath2DPathEffect::toString(SkString* str) const {
     str->appendf("SkPath2DPathEffect: (");
     this->INHERITED::toString(str);
     // TODO: print out path information
     str->appendf(")");
 }
 #endif