aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/core/SkMallocPixelRef.h7
-rw-r--r--include/core/SkPixelRef.h20
-rw-r--r--include/gpu/SkGrPixelRef.h4
-rw-r--r--src/core/SkMallocPixelRef.cpp25
-rw-r--r--src/core/SkPixelRef.cpp25
-rw-r--r--src/core/SkScaledImageCache.cpp4
-rw-r--r--src/lazy/SkCachingPixelRef.h9
-rw-r--r--src/lazy/SkDiscardablePixelRef.h3
-rw-r--r--src/ports/SkGlobalInitialization_chromium.cpp3
-rw-r--r--src/ports/SkGlobalInitialization_default.cpp3
10 files changed, 2 insertions, 101 deletions
diff --git a/include/core/SkMallocPixelRef.h b/include/core/SkMallocPixelRef.h
index 5415e01900..63ed19ae3c 100644
--- a/include/core/SkMallocPixelRef.h
+++ b/include/core/SkMallocPixelRef.h
@@ -82,17 +82,10 @@ public:
SkColorTable*) SK_OVERRIDE;
};
-#ifdef SK_SUPPORT_LEGACY_PIXELREF_UNFLATTENABLE
- SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkMallocPixelRef)
-#endif
-
protected:
// The ownPixels version of this constructor is deprecated.
SkMallocPixelRef(const SkImageInfo&, void* addr, size_t rb, SkColorTable*,
bool ownPixels);
-#ifdef SK_SUPPORT_LEGACY_PIXELREF_UNFLATTENABLE
- SkMallocPixelRef(SkReadBuffer& buffer);
-#endif
virtual ~SkMallocPixelRef();
virtual bool onNewLockPixels(LockRec*) SK_OVERRIDE;
diff --git a/include/core/SkPixelRef.h b/include/core/SkPixelRef.h
index 263145ba3d..80d1380916 100644
--- a/include/core/SkPixelRef.h
+++ b/include/core/SkPixelRef.h
@@ -12,7 +12,6 @@
#include "SkDynamicAnnotations.h"
#include "SkRefCnt.h"
#include "SkString.h"
-#include "SkFlattenable.h"
#include "SkImageInfo.h"
#include "SkTDArray.h"
@@ -32,13 +31,6 @@
// #define SK_IGNORE_PIXELREF_SETPRELOCKED
#endif
-#ifdef SK_SUPPORT_LEGACY_PIXELREF_UNFLATTENABLE
- // we only support unflattening, not flattening
- #define SK_PIXELREF_BASECLASS SkFlattenable
-#else
- #define SK_PIXELREF_BASECLASS SkRefCnt
-#endif
-
class SkColorTable;
class SkData;
struct SkIRect;
@@ -54,7 +46,7 @@ class GrTexture;
This class can be shared/accessed between multiple threads.
*/
-class SK_API SkPixelRef : public SK_PIXELREF_BASECLASS {
+class SK_API SkPixelRef : public SkRefCnt {
public:
SK_DECLARE_INST_COUNT(SkPixelRef)
@@ -258,10 +250,6 @@ public:
virtual void globalUnref();
#endif
-#ifdef SK_SUPPORT_LEGACY_PIXELREF_UNFLATTENABLE
- SK_DEFINE_FLATTENABLE_TYPE(SkPixelRef)
-#endif
-
// Register a listener that may be called the next time our generation ID changes.
//
// We'll only call the listener if we're confident that we are the only SkPixelRef with this
@@ -372,11 +360,7 @@ private:
friend class SkBitmap; // only for cloneGenID
void cloneGenID(const SkPixelRef&);
-#ifdef SK_SUPPORT_LEGACY_PIXELREF_UNFLATTENABLE
- virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE { sk_throw(); }
-#endif
-
- typedef SK_PIXELREF_BASECLASS INHERITED;
+ typedef SkRefCnt INHERITED;
};
class SkPixelRefFactory : public SkRefCnt {
diff --git a/include/gpu/SkGrPixelRef.h b/include/gpu/SkGrPixelRef.h
index 5599fb79c9..7e6a9d02ed 100644
--- a/include/gpu/SkGrPixelRef.h
+++ b/include/gpu/SkGrPixelRef.h
@@ -51,10 +51,6 @@ public:
// override from SkPixelRef
virtual GrTexture* getTexture() SK_OVERRIDE;
-#ifdef SK_SUPPORT_LEGACY_PIXELREF_UNFLATTENABLE
- SK_DECLARE_UNFLATTENABLE_OBJECT()
-#endif
-
protected:
// overrides from SkPixelRef
virtual bool onReadPixels(SkBitmap* dst, const SkIRect* subset) SK_OVERRIDE;
diff --git a/src/core/SkMallocPixelRef.cpp b/src/core/SkMallocPixelRef.cpp
index 447083a50a..0d50164832 100644
--- a/src/core/SkMallocPixelRef.cpp
+++ b/src/core/SkMallocPixelRef.cpp
@@ -200,31 +200,6 @@ size_t SkMallocPixelRef::getAllocatedSizeInBytes() const {
return this->info().getSafeSize(fRB);
}
-#ifdef SK_SUPPORT_LEGACY_PIXELREF_UNFLATTENABLE
-SkMallocPixelRef::SkMallocPixelRef(SkReadBuffer& buffer)
- : INHERITED(buffer, NULL)
- , fReleaseProc(sk_free_releaseproc)
- , fReleaseProcContext(NULL)
-{
- fRB = buffer.read32();
- size_t size = buffer.isValid() ? this->info().getSafeSize(fRB) : 0;
- if (buffer.validateAvailable(size)) {
- fStorage = sk_malloc_throw(size);
- buffer.readByteArray(fStorage, size);
- } else {
- fStorage = NULL;
- }
-
- if (buffer.readBool()) {
- fCTable = SkNEW_ARGS(SkColorTable, (buffer));
- } else {
- fCTable = NULL;
- }
-
- this->setPreLocked(fStorage, fRB, fCTable);
-}
-#endif
-
///////////////////////////////////////////////////////////////////////////////
SkPixelRef* SkMallocPixelRef::PRFactory::create(const SkImageInfo& info, size_t rowBytes,
diff --git a/src/core/SkPixelRef.cpp b/src/core/SkPixelRef.cpp
index 3664dfa17f..be46432be1 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();
}
diff --git a/src/core/SkScaledImageCache.cpp b/src/core/SkScaledImageCache.cpp
index 1e7f51dd9e..6d63edb468 100644
--- a/src/core/SkScaledImageCache.cpp
+++ b/src/core/SkScaledImageCache.cpp
@@ -158,10 +158,6 @@ public:
SkOneShotDiscardablePixelRef(const SkImageInfo&, SkDiscardableMemory*, size_t rowBytes);
~SkOneShotDiscardablePixelRef();
-#ifdef SK_SUPPORT_LEGACY_PIXELREF_UNFLATTENABLE
- SK_DECLARE_UNFLATTENABLE_OBJECT()
-#endif
-
protected:
virtual bool onNewLockPixels(LockRec*) SK_OVERRIDE;
virtual void onUnlockPixels() SK_OVERRIDE;
diff --git a/src/lazy/SkCachingPixelRef.h b/src/lazy/SkCachingPixelRef.h
index 193fe45482..1e87874f74 100644
--- a/src/lazy/SkCachingPixelRef.h
+++ b/src/lazy/SkCachingPixelRef.h
@@ -49,15 +49,6 @@ protected:
return fImageGenerator->refEncodedData();
}
-#ifdef SK_SUPPORT_LEGACY_PIXELREF_UNFLATTENABLE
- // No need to flatten this object. When flattening an SkBitmap,
- // SkWriteBuffer will check the encoded data and write that
- // instead.
- // Future implementations of SkWriteBuffer will need to
- // special case for onRefEncodedData as well.
- SK_DECLARE_UNFLATTENABLE_OBJECT()
-#endif
-
private:
SkImageGenerator* const fImageGenerator;
bool fErrorInDecoding;
diff --git a/src/lazy/SkDiscardablePixelRef.h b/src/lazy/SkDiscardablePixelRef.h
index ae955d6eba..2edef80128 100644
--- a/src/lazy/SkDiscardablePixelRef.h
+++ b/src/lazy/SkDiscardablePixelRef.h
@@ -21,9 +21,6 @@
class SkDiscardablePixelRef : public SkPixelRef {
public:
SK_DECLARE_INST_COUNT(SkDiscardablePixelRef)
-#ifdef SK_SUPPORT_LEGACY_PIXELREF_UNFLATTENABLE
- SK_DECLARE_UNFLATTENABLE_OBJECT()
-#endif
protected:
~SkDiscardablePixelRef();
diff --git a/src/ports/SkGlobalInitialization_chromium.cpp b/src/ports/SkGlobalInitialization_chromium.cpp
index a1a6f8d0db..2bfe1c5240 100644
--- a/src/ports/SkGlobalInitialization_chromium.cpp
+++ b/src/ports/SkGlobalInitialization_chromium.cpp
@@ -106,9 +106,6 @@ static void InitializeFlattenables() {
SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkMergeImageFilter)
SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkColorFilterImageFilter)
SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkDownSampleImageFilter)
-#ifdef SK_SUPPORT_LEGACY_PIXELREF_UNFLATTENABLE
- SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkMallocPixelRef)
-#endif
SkArithmeticMode::InitializeFlattenables();
SkBlurMaskFilter::InitializeFlattenables();
diff --git a/src/ports/SkGlobalInitialization_default.cpp b/src/ports/SkGlobalInitialization_default.cpp
index 5c693af13f..a521b16921 100644
--- a/src/ports/SkGlobalInitialization_default.cpp
+++ b/src/ports/SkGlobalInitialization_default.cpp
@@ -106,9 +106,6 @@ static void InitializeFlattenables() {
SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkMergeImageFilter)
SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkColorFilterImageFilter)
SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkDownSampleImageFilter)
-#ifdef SK_SUPPORT_LEGACY_PIXELREF_UNFLATTENABLE
- SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkMallocPixelRef)
-#endif
SkArithmeticMode::InitializeFlattenables();
SkBlurMaskFilter::InitializeFlattenables();
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-05 21:50:25 +0000