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

Unified Diff: src/effects/SkXfermodeImageFilter.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/SkTileImageFilter.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/effects/SkXfermodeImageFilter.cpp
diff --git a/src/effects/SkXfermodeImageFilter.cpp b/src/effects/SkXfermodeImageFilter.cpp
index 15ff92acf48f96d469de61a439519f92c4248e88..88ea3f8a31247066ca4384ccd0026ccab399d326 100644
--- a/src/effects/SkXfermodeImageFilter.cpp
+++ b/src/effects/SkXfermodeImageFilter.cpp
@@ -22,8 +22,9 @@
SkXfermodeImageFilter::SkXfermodeImageFilter(SkXfermode* mode,
SkImageFilter* inputs[2],
- const CropRect* cropRect)
- : INHERITED(2, inputs, cropRect), fMode(mode) {
+ const CropRect* cropRect,
+ uint32_t uniqueID)
+ : INHERITED(2, inputs, cropRect, uniqueID), fMode(mode) {
SkSafeRef(fMode);
}
@@ -41,7 +42,7 @@ SkXfermodeImageFilter::SkXfermodeImageFilter(SkReadBuffer& buffer)
SkFlattenable* SkXfermodeImageFilter::CreateProc(SkReadBuffer& buffer) {
SK_IMAGEFILTER_UNFLATTEN_COMMON(common, 2);
SkAutoTUnref<SkXfermode> mode(buffer.readXfermode());
- return Create(mode, common.getInput(0), common.getInput(1), &common.cropRect());
+ return Create(mode, common.getInput(0), common.getInput(1), &common.cropRect(), common.uniqueID());
}
void SkXfermodeImageFilter::flatten(SkWriteBuffer& buffer) const {
« no previous file with comments | « src/effects/SkTileImageFilter.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698