Remove uniqueID from all filter serialization.

src/effects/SkMergeImageFilter.cpp

 /*
  * Copyright 2012 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 "SkMergeImageFilter.h"
 #include "SkCanvas.h"
 #include "SkDevice.h"
@@ skipping 23 matching lines @@
         int inputCount = countInputs();
         for (int i = 0; i < inputCount; ++i) {
             fModes[i] = SkToU8(modes[i]);
         }
     } else {
         fModes = NULL;
     }
 }
 
 SkMergeImageFilter::SkMergeImageFilter(SkImageFilter* filters[], int count,
                                        const SkXfermode::Mode modes[],

[robertphillips, 2015/03/18 16:51:43]

overlength ?

[Stephen White, 2015/03/18 16:55:29]

Fixed.

-                                       const CropRect* cropRect,
-                                       uint32_t uniqueID)
-  : INHERITED(count, filters, cropRect, uniqueID) {
+                                       const CropRect* cropRect) : INHERITED(count, filters, cropRect) {
     SkASSERT(count >= 0);
     this->initModes(modes);
 }
 
 SkMergeImageFilter::~SkMergeImageFilter() {
 
     if (fModes != SkTCast<uint8_t*>(fStorage)) {
         sk_free(fModes);
     }
 }
@@ skipping 63 matching lines @@
         if (!buffer.readByteArray(modes8.get(), count)) {
             return NULL;
         }
         for (int i = 0; i < count; ++i) {
             modes[i] = (SkXfermode::Mode)modes8[i];
             buffer.validate(SkIsValidMode(modes[i]));
         }
         if (!buffer.isValid()) {
             return NULL;
         }
-        return Create(common.inputs(), count, modes.get(), &common.cropRect(), common.uniqueID());
+        return Create(common.inputs(), count, modes.get(), &common.cropRect());
     }
-    return Create(common.inputs(), count, NULL, &common.cropRect(), common.uniqueID());
+    return Create(common.inputs(), count, NULL, &common.cropRect());
 }
 
 void SkMergeImageFilter::flatten(SkWriteBuffer& buffer) const {
     this->INHERITED::flatten(buffer);
     buffer.writeBool(fModes != NULL);
     if (fModes) {
         buffer.writeByteArray(fModes, countInputs() * sizeof(fModes[0]));
     }
 }
 
 #ifndef SK_IGNORE_TO_STRING
 void SkMergeImageFilter::toString(SkString* str) const {
     str->appendf("SkMergeImageFilter: (");
     
     for (int i = 0; i < this->countInputs(); ++i) {
         SkImageFilter* filter = this->getInput(i);
         str->appendf("%d: (", i);
         filter->toString(str);
         str->appendf(")");
     }
 
     str->append(")");
 }
 #endif