Simplify flattening to just write enough to call the factory

src/effects/Sk1DPathEffect.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 "Sk1DPathEffect.h"
@@ skipping 129 matching lines @@
             case SkPath::kClose_Verb:
                 dst->close();
                 break;
             default:
                 SkDEBUGFAIL("unknown verb");
                 break;
         }
     }
 }
 
+#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING
 SkPath1DPathEffect::SkPath1DPathEffect(SkReadBuffer& buffer) {
     fAdvance = buffer.readScalar();
     if (fAdvance > 0) {
         buffer.readPath(&fPath);
         fInitialOffset = buffer.readScalar();
         fStyle = (Style) buffer.readUInt();
     } else {
         SkDEBUGF(("SkPath1DPathEffect can't use advance <= 0\n"));
         // Make Coverity happy.
         fInitialOffset = 0;
         fStyle = kStyleCount;
     }
 }
+#endif
 
 SkScalar SkPath1DPathEffect::begin(SkScalar contourLength) const {
     return fInitialOffset;
 }
 
+SkFlattenable* SkPath1DPathEffect::CreateProc(SkReadBuffer& buffer) {
+    SkScalar advance = buffer.readScalar();
+    if (advance > 0) {
+        SkPath path;
+        buffer.readPath(&path);
+        SkScalar phase = buffer.readScalar();
+        Style style = (Style)buffer.readUInt();
+        return SkPath1DPathEffect::Create(path, advance, phase, style);

[sugoi1, 2014/08/19 18:46:16]

Hmmm... Wouldn't it be better to validate style here to avoid problems later?

[reed1, 2014/08/19 19:58:05]

I think there are lots of additional validation checks we could add. I feel this
CL is already huge, and am trying to avoid any changes not germane to this new
Flatten technique. Can we defer this sort of improvement to another CL?

+    }
+    return NULL;
+}
+
 void SkPath1DPathEffect::flatten(SkWriteBuffer& buffer) const {
-    this->INHERITED::flatten(buffer);
     buffer.writeScalar(fAdvance);
     if (fAdvance > 0) {
         buffer.writePath(fPath);
         buffer.writeScalar(fInitialOffset);
         buffer.writeUInt(fStyle);
     }
 }
 
 SkScalar SkPath1DPathEffect::next(SkPath* dst, SkScalar distance,
                                   SkPathMeasure& meas) const {
@@ skipping 12 matching lines @@
         } break;
         case kMorph_Style:
             morphpath(dst, fPath, meas, distance);
             break;
         default:
             SkDEBUGFAIL("unknown Style enum");
             break;
     }
     return fAdvance;
 }