include/effects/SkDisplacementMapEffect.h - Issue 1019493002: Remove uniqueID from all filter serialization.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: include/effects/SkDisplacementMapEffect.h

Issue 1019493002: Remove uniqueID from all filter serialization. (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: Null out fUniqueID deserialization Created 5 years, 9 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: include/effects/SkDisplacementMapEffect.h

diff --git a/include/effects/SkDisplacementMapEffect.h b/include/effects/SkDisplacementMapEffect.h

index e55b324ce9da755c88ca95e590b8667f801adf19..b3fa8d5f00062c7b7cb49223e002e8c977f4f0a6 100644

--- a/include/effects/SkDisplacementMapEffect.h

+++ b/include/effects/SkDisplacementMapEffect.h

@@ -27,8 +27,7 @@ public:

ChannelSelectorType yChannelSelector,

SkScalar scale, SkImageFilter* displacement,

SkImageFilter* color = NULL,

- const CropRect* cropRect = NULL,

- uint32_t uniqueID = 0);

+ const CropRect* cropRect = NULL);

SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkDisplacementMapEffect)

@@ -54,8 +53,7 @@ protected:

SkDisplacementMapEffect(ChannelSelectorType xChannelSelector,

ChannelSelectorType yChannelSelector,

SkScalar scale, SkImageFilter* inputs[2],

- const CropRect* cropRect,

- uint32_t uniqueID);

+ const CropRect* cropRect);

void flatten(SkWriteBuffer&) const SK_OVERRIDE;

private: