From 24e06d5244ae96e440410e1d76e039983b2efac9 Mon Sep 17 00:00:00 2001 From: senorblanco Date: Wed, 18 Mar 2015 12:11:33 -0700 Subject: Remove uniqueID from all filter serialization. (This is essentially a revert of https://codereview.chromium.org/503833002/.) This was necessary back when SkPaint was flattened even for in-process use. Now that we only flatten SkPaint for cross-process use, there's no need to serialize UniqueIDs. Note: SkDropShadowImageFilter is being constructed with a croprect and UniqueID (of 0) in Blink. I've made the uniqueID param default to 0 temporarily, until this rolls in and Blink can be changed. (Blink can't be changed first, since unlike the other filters, there's no constructor that takes a cropRect but not a uniqueID.) BUG=skia: Review URL: https://codereview.chromium.org/1019493002 --- include/effects/SkBlurImageFilter.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'include/effects/SkBlurImageFilter.h') diff --git a/include/effects/SkBlurImageFilter.h b/include/effects/SkBlurImageFilter.h index d6b506621d..6f4537fed7 100644 --- a/include/effects/SkBlurImageFilter.h +++ b/include/effects/SkBlurImageFilter.h @@ -16,8 +16,8 @@ public: static SkBlurImageFilter* Create(SkScalar sigmaX, SkScalar sigmaY, SkImageFilter* input = NULL, - const CropRect* cropRect = NULL, uint32_t uniqueID = 0) { - return SkNEW_ARGS(SkBlurImageFilter, (sigmaX, sigmaY, input, cropRect, uniqueID)); + const CropRect* cropRect = NULL) { + return SkNEW_ARGS(SkBlurImageFilter, (sigmaX, sigmaY, input, cropRect)); } void computeFastBounds(const SkRect&, SkRect*) const SK_OVERRIDE; @@ -29,8 +29,7 @@ protected: SkBlurImageFilter(SkScalar sigmaX, SkScalar sigmaY, SkImageFilter* input, - const CropRect* cropRect, - uint32_t uniqueID); + const CropRect* cropRect); void flatten(SkWriteBuffer&) const SK_OVERRIDE; virtual bool onFilterImage(Proxy*, const SkBitmap& src, const Context&, -- cgit v1.2.3