Simplify flattening to just write enough to call the factory

src/effects/SkLayerDrawLooper.cpp

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #include "SkCanvas.h"
 #include "SkColor.h"
 #include "SkReadBuffer.h"
@@ skipping 182 matching lines @@
         bsRec->fColor = fRecs->fPaint.getColor();
         bsRec->fStyle = maskBlur.fStyle;
         bsRec->fQuality = maskBlur.fQuality;
     }
     return true;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 void SkLayerDrawLooper::flatten(SkWriteBuffer& buffer) const {
-    this->INHERITED::flatten(buffer);
-
-#ifdef SK_DEBUG
-    {
-        Rec* rec = fRecs;
-        int count = 0;
-        while (rec) {
-            rec = rec->fNext;
-            count += 1;
-        }
-        SkASSERT(count == fCount);
-    }
-#endif
-
     buffer.writeInt(fCount);
 
     Rec* rec = fRecs;
     for (int i = 0; i < fCount; i++) {
         // Legacy "flagsmask" field -- now ignored, remove when we bump version
         buffer.writeInt(0);
 
         buffer.writeInt(rec->fInfo.fPaintBits);
         buffer.writeInt(rec->fInfo.fColorMode);
         buffer.writePoint(rec->fInfo.fOffset);
@@ skipping 11 matching lines @@
         LayerInfo info;
         // Legacy "flagsmask" field -- now ignored, remove when we bump version
         (void)buffer.readInt();
 
         info.fPaintBits = buffer.readInt();
         info.fColorMode = (SkXfermode::Mode)buffer.readInt();
         buffer.readPoint(&info.fOffset);
         info.fPostTranslate = buffer.readBool();
         buffer.readPaint(builder.addLayerOnTop(info));
     }
-    SkLayerDrawLooper* looper = builder.detachLooper();
-    SkASSERT(count == looper->fCount);
-
-#ifdef SK_DEBUG
-    {
-        Rec* rec = looper->fRecs;
-        int n = 0;
-        while (rec) {
-            rec = rec->fNext;
-            n += 1;
-        }
-        SkASSERT(count == n);
-    }
-#endif
-
-    return looper;
+    return builder.detachLooper();
 }
 
 #ifndef SK_IGNORE_TO_STRING
 void SkLayerDrawLooper::toString(SkString* str) const {
     str->appendf("SkLayerDrawLooper (%d): ", fCount);
 
     Rec* rec = fRecs;
     for (int i = 0; i < fCount; i++) {
         str->appendf("%d: paintBits: (", i);
         if (0 == rec->fInfo.fPaintBits) {
@@ skipping 104 matching lines @@
     SkLayerDrawLooper* looper = SkNEW(SkLayerDrawLooper);
     looper->fCount = fCount;
     looper->fRecs = fRecs;
 
     fCount = 0;
     fRecs = NULL;
     fTopRec = NULL;
 
     return looper;
 }