| Index: src/image/SkImage_Base.h
|
| diff --git a/src/image/SkImage_Base.h b/src/image/SkImage_Base.h
|
| index b3661d99fea4aee55276742e65a4ef07e61fa322..37dcb40d254fbce41d6605cb12de4fcea4bbae62 100644
|
| --- a/src/image/SkImage_Base.h
|
| +++ b/src/image/SkImage_Base.h
|
| @@ -11,14 +11,18 @@
|
| #include "SkImage.h"
|
| #include "SkSurface.h"
|
|
|
| +enum {
|
| + kNeedNewImageUniqueID = 0
|
| +};
|
| +
|
| static SkSurfaceProps copy_or_safe_defaults(const SkSurfaceProps* props) {
|
| return props ? *props : SkSurfaceProps(0, kUnknown_SkPixelGeometry);
|
| }
|
|
|
| class SkImage_Base : public SkImage {
|
| public:
|
| - SkImage_Base(int width, int height, const SkSurfaceProps* props)
|
| - : INHERITED(width, height)
|
| + SkImage_Base(int width, int height, uint32_t uniqueID, const SkSurfaceProps* props)
|
| + : INHERITED(width, height, uniqueID)
|
| , fProps(copy_or_safe_defaults(props))
|
| {}
|
|
|
|
|