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

Unified Diff: include/effects/SkPictureImageFilter.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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « include/effects/SkOffsetImageFilter.h ('k') | include/effects/SkRectShaderImageFilter.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: include/effects/SkPictureImageFilter.h
diff --git a/include/effects/SkPictureImageFilter.h b/include/effects/SkPictureImageFilter.h
index 332663f73055c06e42312d94ce2d61146a4501f4..21d25c46935b4088f001a7c8497225aa5a3b8075 100644
--- a/include/effects/SkPictureImageFilter.h
+++ b/include/effects/SkPictureImageFilter.h
@@ -16,17 +16,16 @@ public:
/**
* Refs the passed-in picture.
*/
- static SkPictureImageFilter* Create(const SkPicture* picture, int32_t uniqueID = 0) {
- return SkNEW_ARGS(SkPictureImageFilter, (picture, uniqueID));
+ static SkPictureImageFilter* Create(const SkPicture* picture) {
+ return SkNEW_ARGS(SkPictureImageFilter, (picture));
}
/**
* Refs the passed-in picture. cropRect can be used to crop or expand the destination rect when
* the picture is drawn. (No scaling is implied by the dest rect; only the CTM is applied.)
*/
- static SkPictureImageFilter* Create(const SkPicture* picture, const SkRect& cropRect,
- uint32_t uniqueID = 0) {
- return SkNEW_ARGS(SkPictureImageFilter, (picture, cropRect, uniqueID,
+ static SkPictureImageFilter* Create(const SkPicture* picture, const SkRect& cropRect) {
+ return SkNEW_ARGS(SkPictureImageFilter, (picture, cropRect,
kDeviceSpace_PictureResolution,
kLow_SkFilterQuality));
}
@@ -40,17 +39,15 @@ public:
*/
static SkPictureImageFilter* CreateForLocalSpace(const SkPicture* picture,
const SkRect& cropRect,
- SkFilterQuality filterQuality,
- uint32_t uniqueID = 0) {
- return SkNEW_ARGS(SkPictureImageFilter, (picture, cropRect, uniqueID,
+ SkFilterQuality filterQuality) {
+ return SkNEW_ARGS(SkPictureImageFilter, (picture, cropRect,
kLocalSpace_PictureResolution, filterQuality));
}
#ifdef SK_SUPPORT_LEGACY_FILTERLEVEL_ENUM
static SkPictureImageFilter* CreateForLocalSpace(const SkPicture* picture,
const SkRect& cropRect,
- SkPaint::FilterLevel filterLevel,
- uint32_t uniqueID = 0) {
- return CreateForLocalSpace(picture, cropRect, (SkFilterQuality)filterLevel, uniqueID);
+ SkPaint::FilterLevel filterLevel) {
+ return CreateForLocalSpace(picture, cropRect, (SkFilterQuality)filterLevel);
}
#endif
SK_TO_STRING_OVERRIDE()
@@ -62,8 +59,8 @@ protected:
kLocalSpace_PictureResolution
};
- explicit SkPictureImageFilter(const SkPicture* picture, uint32_t uniqueID);
- SkPictureImageFilter(const SkPicture* picture, const SkRect& cropRect, uint32_t uniqueID,
+ explicit SkPictureImageFilter(const SkPicture* picture);
+ SkPictureImageFilter(const SkPicture* picture, const SkRect& cropRect,
PictureResolution, SkFilterQuality);
virtual ~SkPictureImageFilter();
/* Constructs an SkPictureImageFilter object from an SkReadBuffer.
« no previous file with comments | « include/effects/SkOffsetImageFilter.h ('k') | include/effects/SkRectShaderImageFilter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698