| Index: src/core/SkPixelRef.cpp
|
| diff --git a/src/core/SkPixelRef.cpp b/src/core/SkPixelRef.cpp
|
| index 3664dfa17f7b4d1e544bd99dac063ae01a6b1770..be46432be1461c048baa4c6a0e1b9bd000d4a9e4 100644
|
| --- a/src/core/SkPixelRef.cpp
|
| +++ b/src/core/SkPixelRef.cpp
|
| @@ -108,31 +108,6 @@ SkPixelRef::SkPixelRef(const SkImageInfo& info, SkBaseMutex* mutex) : fInfo(info
|
| fPreLocked = false;
|
| }
|
|
|
| -#ifdef SK_SUPPORT_LEGACY_PIXELREF_UNFLATTENABLE
|
| -static SkImageInfo read_info(SkReadBuffer& buffer) {
|
| - SkImageInfo info;
|
| - info.unflatten(buffer);
|
| - return info;
|
| -}
|
| -
|
| -SkPixelRef::SkPixelRef(SkReadBuffer& buffer, SkBaseMutex* mutex)
|
| - : INHERITED(buffer)
|
| - , fInfo(read_info(buffer))
|
| -{
|
| - SkDEBUGCODE(SkAlphaType alphaType;)
|
| - SkASSERT(SkColorTypeValidateAlphaType(fInfo.colorType(), fInfo.alphaType(), &alphaType));
|
| - SkASSERT(fInfo.fAlphaType == alphaType);
|
| -
|
| - this->setMutex(mutex);
|
| - fRec.zero();
|
| - fLockCount = 0;
|
| - fIsImmutable = buffer.readBool();
|
| - fGenerationID = buffer.readUInt();
|
| - fUniqueGenerationID = false; // Conservatively assuming the original still exists.
|
| - fPreLocked = false;
|
| -}
|
| -#endif
|
| -
|
| SkPixelRef::~SkPixelRef() {
|
| this->callGenIDChangeListeners();
|
| }
|
|
|