diff options
author | senorblanco <senorblanco@chromium.org> | 2015-03-18 12:11:33 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-03-18 12:11:33 -0700 |
commit | 24e06d5244ae96e440410e1d76e039983b2efac9 (patch) | |
tree | a836fa9291bdcfd543cc25edc964527b77b91dba /gm/tablecolorfilter.cpp | |
parent | 6fbfdb1e5ebe42bf16d929082b43186c8183b063 (diff) |
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
Diffstat (limited to 'gm/tablecolorfilter.cpp')
-rw-r--r-- | gm/tablecolorfilter.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gm/tablecolorfilter.cpp b/gm/tablecolorfilter.cpp index 0d6da8f475..deba9e55e9 100644 --- a/gm/tablecolorfilter.cpp +++ b/gm/tablecolorfilter.cpp @@ -164,7 +164,7 @@ protected: for (unsigned i = 0; i < SK_ARRAY_COUNT(gColorFilterMakers); ++i) { SkAutoTUnref<SkColorFilter> colorFilter1(gColorFilterMakers[i]()); SkAutoTUnref<SkImageFilter> imageFilter1(SkColorFilterImageFilter::Create( - colorFilter1, NULL, NULL, 0)); + colorFilter1, NULL, NULL)); // Move down to the next line and draw it // each draw being at xOffset of the previous one @@ -173,7 +173,7 @@ protected: for (unsigned j = 1; j < SK_ARRAY_COUNT(gColorFilterMakers); ++j) { SkAutoTUnref<SkColorFilter> colorFilter2(gColorFilterMakers[j]()); SkAutoTUnref<SkImageFilter> imageFilter2(SkColorFilterImageFilter::Create( - colorFilter2, imageFilter1, NULL, 0)); + colorFilter2, imageFilter1, NULL)); paint.setImageFilter(imageFilter2); canvas->drawBitmap(bm, x, y, &paint); x += xOffset; |