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 /include/effects/SkTileImageFilter.h | |
| 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 'include/effects/SkTileImageFilter.h')
| -rw-r--r-- | include/effects/SkTileImageFilter.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/effects/SkTileImageFilter.h b/include/effects/SkTileImageFilter.h index 82673d65e0..95b4c75282 100644 --- a/include/effects/SkTileImageFilter.h +++ b/include/effects/SkTileImageFilter.h @@ -20,7 +20,7 @@ public: @param input Input from which the subregion defined by srcRect will be tiled */ static SkTileImageFilter* Create(const SkRect& srcRect, const SkRect& dstRect, - SkImageFilter* input, uint32_t uniqueID = 0); + SkImageFilter* input); virtual bool onFilterImage(Proxy* proxy, const SkBitmap& src, const Context& ctx, SkBitmap* dst, SkIPoint* offset) const SK_OVERRIDE; @@ -31,8 +31,8 @@ public: SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkTileImageFilter) protected: - SkTileImageFilter(const SkRect& srcRect, const SkRect& dstRect, SkImageFilter* input, uint32_t uniqueID) - : INHERITED(1, &input, NULL, uniqueID), fSrcRect(srcRect), fDstRect(dstRect) {} + SkTileImageFilter(const SkRect& srcRect, const SkRect& dstRect, SkImageFilter* input) + : INHERITED(1, &input, NULL), fSrcRect(srcRect), fDstRect(dstRect) {} void flatten(SkWriteBuffer& buffer) const SK_OVERRIDE; |