Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(303)

Issue 1019493002: Remove uniqueID from all filter serialization. (Closed)

Created:
5 years, 9 months ago by Stephen White
Modified:
5 years, 9 months ago
Reviewers:
robertphillips, reed1
CC:
reviews_skia.org, mtklein
Base URL:
https://skia.googlesource.com/skia.git@master
Target Ref:
refs/heads/master
Project:
skia
Visibility:
Public.

Description

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: Committed: https://skia.googlesource.com/skia/+/24e06d5244ae96e440410e1d76e039983b2efac9

Patch Set 1 #

Patch Set 2 : Remove spurious assert. #

Patch Set 3 : Make SkDropShadowImageFilter backwards-compatible #

Patch Set 4 : Restore deprecated factory fn (Chrome still calls it) #

Patch Set 5 : Restore deprecated factory fn (Chrome still calls it) #

Total comments: 4

Patch Set 6 : Changes per review comments #

Patch Set 7 : Null out fUniqueID deserialization #

Unified diffs Side-by-side diffs Delta from patch set Stats (+147 lines, -182 lines) Patch
M bench/ImageFilterCollapse.cpp View 1 chunk +1 line, -1 line 0 comments Download
M gm/dropshadowimagefilter.cpp View 1 chunk +3 lines, -3 lines 0 comments Download
M gm/filterfastbounds.cpp View 2 chunks +2 lines, -2 lines 0 comments Download
M gm/imagefilterscropexpand.cpp View 1 chunk +1 line, -1 line 0 comments Download
M gm/tablecolorfilter.cpp View 2 chunks +2 lines, -2 lines 0 comments Download
M include/core/SkImageFilter.h View 1 2 3 4 5 6 2 chunks +1 line, -3 lines 0 comments Download
M include/effects/SkBlurImageFilter.h View 2 chunks +3 lines, -4 lines 0 comments Download
M include/effects/SkColorFilterImageFilter.h View 2 chunks +2 lines, -4 lines 0 comments Download
M include/effects/SkDisplacementMapEffect.h View 2 chunks +2 lines, -4 lines 0 comments Download
M include/effects/SkDropShadowImageFilter.h View 1 2 3 4 3 chunks +6 lines, -8 lines 0 comments Download
M include/effects/SkLightingImageFilter.h View 1 chunk +1 line, -2 lines 0 comments Download
M include/effects/SkMatrixConvolutionImageFilter.h View 2 chunks +2 lines, -4 lines 0 comments Download
M include/effects/SkMatrixImageFilter.h View 2 chunks +4 lines, -7 lines 0 comments Download
M include/effects/SkMergeImageFilter.h View 2 chunks +5 lines, -8 lines 0 comments Download
M include/effects/SkMorphologyImageFilter.h View 5 chunks +9 lines, -11 lines 0 comments Download
M include/effects/SkOffsetImageFilter.h View 1 chunk +3 lines, -4 lines 0 comments Download
M include/effects/SkPictureImageFilter.h View 3 chunks +10 lines, -13 lines 0 comments Download
M include/effects/SkRectShaderImageFilter.h View 2 chunks +2 lines, -2 lines 0 comments Download
M include/effects/SkTileImageFilter.h View 2 chunks +3 lines, -3 lines 0 comments Download
M include/effects/SkXfermodeImageFilter.h View 2 chunks +3 lines, -4 lines 0 comments Download
M samplecode/SampleFilterFuzz.cpp View 1 chunk +1 line, -1 line 0 comments Download
M src/core/SkImageFilter.cpp View 1 2 3 4 5 6 4 chunks +10 lines, -6 lines 0 comments Download
M src/effects/SkBlurImageFilter.cpp View 1 1 chunk +3 lines, -4 lines 0 comments Download
M src/effects/SkColorFilterImageFilter.cpp View 2 chunks +6 lines, -6 lines 0 comments Download
M src/effects/SkDisplacementMapEffect.cpp View 3 chunks +5 lines, -6 lines 0 comments Download
M src/effects/SkDropShadowImageFilter.cpp View 2 chunks +3 lines, -3 lines 0 comments Download
M src/effects/SkLightingImageFilter.cpp View 1 2 3 4 5 11 chunks +16 lines, -20 lines 0 comments Download
M src/effects/SkMatrixConvolutionImageFilter.cpp View 4 chunks +5 lines, -7 lines 0 comments Download
M src/effects/SkMatrixImageFilter.cpp View 2 chunks +5 lines, -7 lines 0 comments Download
M src/effects/SkMergeImageFilter.cpp View 1 2 3 4 5 2 chunks +4 lines, -5 lines 0 comments Download
M src/effects/SkMorphologyImageFilter.cpp View 2 chunks +4 lines, -5 lines 0 comments Download
M src/effects/SkOffsetImageFilter.cpp View 2 chunks +3 lines, -3 lines 0 comments Download
M src/effects/SkPictureImageFilter.cpp View 2 chunks +4 lines, -4 lines 0 comments Download
M src/effects/SkRectShaderImageFilter.cpp View 1 chunk +5 lines, -6 lines 0 comments Download
M src/effects/SkTileImageFilter.cpp View 2 chunks +3 lines, -3 lines 0 comments Download
M src/effects/SkXfermodeImageFilter.cpp View 2 chunks +3 lines, -4 lines 0 comments Download
M tests/ImageFilterTest.cpp View 2 chunks +2 lines, -2 lines 0 comments Download

Messages

Total messages: 13 (3 generated)
Stephen White
PTAL. Thanks!
5 years, 9 months ago (2015-03-18 14:34:25 UTC) #2
reed1
5 years, 9 months ago (2015-03-18 15:01:05 UTC) #4
robertphillips
This doesn't seem to actually alter the serialization. https://codereview.chromium.org/1019493002/diff/80001/src/effects/SkLightingImageFilter.cpp File src/effects/SkLightingImageFilter.cpp (right): https://codereview.chromium.org/1019493002/diff/80001/src/effects/SkLightingImageFilter.cpp#newcode963 src/effects/SkLightingImageFilter.cpp:963: SkDiffuseLightingImageFilter::SkDiffuseLightingImageFilter(SkLight* ...
5 years, 9 months ago (2015-03-18 16:51:43 UTC) #5
Stephen White
Thanks for your review. You're right; this doesn't change the serialization. That'll be removed in ...
5 years, 9 months ago (2015-03-18 16:55:29 UTC) #6
robertphillips
lgtm but I would (perhaps quixotically) still like a VC to understand what's going on ...
5 years, 9 months ago (2015-03-18 17:08:13 UTC) #7
Stephen White
OK, new patch up which nulls out serialization/deserialzation of uniqueID.
5 years, 9 months ago (2015-03-18 17:47:05 UTC) #8
robertphillips
lgtm but we probably do want a follow up that adds the VXX_COMPATIBILITY_CODE guards
5 years, 9 months ago (2015-03-18 18:02:16 UTC) #9
reed1
lgtm
5 years, 9 months ago (2015-03-18 18:08:42 UTC) #10
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1019493002/120001
5 years, 9 months ago (2015-03-18 19:05:22 UTC) #12
commit-bot: I haz the power
5 years, 9 months ago (2015-03-18 19:11:37 UTC) #13
Message was sent while issue was closed.
Committed patchset #7 (id:120001) as
https://skia.googlesource.com/skia/+/24e06d5244ae96e440410e1d76e039983b2efac9

Powered by Google App Engine
This is Rietveld 408576698