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

Unified Diff: src/effects/SkMatrixImageFilter.cpp

Issue 503833002: Reimplement deserialization of SkImageFilter's uniqueID. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 6 years, 4 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/effects/SkMatrixConvolutionImageFilter.cpp ('k') | src/effects/SkMergeImageFilter.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/effects/SkMatrixImageFilter.cpp
diff --git a/src/effects/SkMatrixImageFilter.cpp b/src/effects/SkMatrixImageFilter.cpp
index 2b7786a2b542262915581d6906ff9e12c8878375..34231ba98b01a0aed67f91da7991efd59d25e1c5 100644
--- a/src/effects/SkMatrixImageFilter.cpp
+++ b/src/effects/SkMatrixImageFilter.cpp
@@ -17,16 +17,18 @@
SkMatrixImageFilter::SkMatrixImageFilter(const SkMatrix& transform,
SkPaint::FilterLevel filterLevel,
- SkImageFilter* input)
- : INHERITED(1, &input),
+ SkImageFilter* input,
+ uint32_t uniqueID)
+ : INHERITED(1, &input, NULL, uniqueID),
fTransform(transform),
fFilterLevel(filterLevel) {
}
SkMatrixImageFilter* SkMatrixImageFilter::Create(const SkMatrix& transform,
SkPaint::FilterLevel filterLevel,
- SkImageFilter* input) {
- return SkNEW_ARGS(SkMatrixImageFilter, (transform, filterLevel, input));
+ SkImageFilter* input,
+ uint32_t uniqueID) {
+ return SkNEW_ARGS(SkMatrixImageFilter, (transform, filterLevel, input, uniqueID));
}
#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING
@@ -42,7 +44,7 @@ SkFlattenable* SkMatrixImageFilter::CreateProc(SkReadBuffer& buffer) {
SkMatrix matrix;
buffer.readMatrix(&matrix);
SkPaint::FilterLevel level = static_cast<SkPaint::FilterLevel>(buffer.readInt());
- return Create(matrix, level, common.getInput(0));
+ return Create(matrix, level, common.getInput(0), common.uniqueID());
}
void SkMatrixImageFilter::flatten(SkWriteBuffer& buffer) const {
« no previous file with comments | « src/effects/SkMatrixConvolutionImageFilter.cpp ('k') | src/effects/SkMergeImageFilter.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698