| Index: src/effects/SkMergeImageFilter.cpp
|
| diff --git a/src/effects/SkMergeImageFilter.cpp b/src/effects/SkMergeImageFilter.cpp
|
| index 7034e158e5ef48e95d49007c180f09bee1443a05..f68d9133782ea25ad70b1019ef09e158cbd33506 100755
|
| --- a/src/effects/SkMergeImageFilter.cpp
|
| +++ b/src/effects/SkMergeImageFilter.cpp
|
| @@ -42,9 +42,8 @@ void SkMergeImageFilter::initModes(const SkXfermode::Mode modes[]) {
|
|
|
| SkMergeImageFilter::SkMergeImageFilter(SkImageFilter* filters[], int count,
|
| const SkXfermode::Mode modes[],
|
| - const CropRect* cropRect,
|
| - uint32_t uniqueID)
|
| - : INHERITED(count, filters, cropRect, uniqueID) {
|
| + const CropRect* cropRect)
|
| + : INHERITED(count, filters, cropRect) {
|
| SkASSERT(count >= 0);
|
| this->initModes(modes);
|
| }
|
| @@ -128,9 +127,9 @@ SkFlattenable* SkMergeImageFilter::CreateProc(SkReadBuffer& buffer) {
|
| 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 {
|
|
|