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

Unified Diff: src/core/SkPixelRef.cpp

Issue 387313004: remove SK_SUPPORT_LEGACY_PIXELREF_UNFLATTENABLE code (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 6 years, 5 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/core/SkMallocPixelRef.cpp ('k') | src/core/SkScaledImageCache.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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();
}
« no previous file with comments | « src/core/SkMallocPixelRef.cpp ('k') | src/core/SkScaledImageCache.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698