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 --- gm/dropshadowimagefilter.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gm/dropshadowimagefilter.cpp') diff --git a/gm/dropshadowimagefilter.cpp b/gm/dropshadowimagefilter.cpp index f60f22c70f..e06264c9da 100644 --- a/gm/dropshadowimagefilter.cpp +++ b/gm/dropshadowimagefilter.cpp @@ -133,11 +133,11 @@ protected: SkDropShadowImageFilter::Create(7.0f, 7.0f, 3.0f, 3.0f, SK_ColorBLUE, SkDropShadowImageFilter::kDrawShadowAndForeground_ShadowMode), SkDropShadowImageFilter::Create(7.0f, 7.0f, 3.0f, 3.0f, SK_ColorBLUE, - SkDropShadowImageFilter::kDrawShadowAndForeground_ShadowMode, cfif, NULL, 0), + SkDropShadowImageFilter::kDrawShadowAndForeground_ShadowMode, cfif, NULL), SkDropShadowImageFilter::Create(7.0f, 7.0f, 3.0f, 3.0f, SK_ColorBLUE, - SkDropShadowImageFilter::kDrawShadowAndForeground_ShadowMode, NULL, &cropRect, 0), + SkDropShadowImageFilter::kDrawShadowAndForeground_ShadowMode, NULL, &cropRect), SkDropShadowImageFilter::Create(7.0f, 7.0f, 3.0f, 3.0f, SK_ColorBLUE, - SkDropShadowImageFilter::kDrawShadowAndForeground_ShadowMode, NULL, &bogusRect, 0), + SkDropShadowImageFilter::kDrawShadowAndForeground_ShadowMode, NULL, &bogusRect), SkDropShadowImageFilter::Create(7.0f, 7.0f, 3.0f, 3.0f, SK_ColorBLUE, SkDropShadowImageFilter::kDrawShadowOnly_ShadowMode), }; -- cgit v1.2.3