| Index: src/core/SkPixelRef.cpp
|
| diff --git a/src/core/SkPixelRef.cpp b/src/core/SkPixelRef.cpp
|
| index 0aa00e0bf58062fee2d3ddd7e706b81c18a44b0c..a2c37c6e72f92de7ce16d301632dacdb6dbb1fbf 100644
|
| --- a/src/core/SkPixelRef.cpp
|
| +++ b/src/core/SkPixelRef.cpp
|
| @@ -87,7 +87,13 @@ static SkImageInfo validate_info(const SkImageInfo& info) {
|
| return info.makeAlphaType(newAlphaType);
|
| }
|
|
|
| -SkPixelRef::SkPixelRef(const SkImageInfo& info) : fInfo(validate_info(info)) {
|
| +SkPixelRef::SkPixelRef(const SkImageInfo& info)
|
| + : fInfo(validate_info(info))
|
| +#ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK
|
| + , fStableID(SkNextPixelRefGenerationID())
|
| +#endif
|
| +
|
| +{
|
| this->setMutex(NULL);
|
| fRec.zero();
|
| fLockCount = 0;
|
| @@ -97,7 +103,12 @@ SkPixelRef::SkPixelRef(const SkImageInfo& info) : fInfo(validate_info(info)) {
|
| }
|
|
|
|
|
| -SkPixelRef::SkPixelRef(const SkImageInfo& info, SkBaseMutex* mutex) : fInfo(validate_info(info)) {
|
| +SkPixelRef::SkPixelRef(const SkImageInfo& info, SkBaseMutex* mutex)
|
| + : fInfo(validate_info(info))
|
| +#ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK
|
| + , fStableID(SkNextPixelRefGenerationID())
|
| +#endif
|
| +{
|
| this->setMutex(mutex);
|
| fRec.zero();
|
| fLockCount = 0;
|
|
|