diff options
author | 2013-12-06 22:07:17 +0000 | |
---|---|---|
committer | 2013-12-06 22:07:17 +0000 | |
commit | f1715706f761e7e254f601abf33581702fa8fe17 (patch) | |
tree | 46f7f620470b8c4480a32f748981f03912c448c8 /src/core/SkPixelRef.cpp | |
parent | 2ebc10dd12a6fe55fda37a9bd5b1e0c1c1e08232 (diff) |
add SK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR, initially always on
BUG=
Review URL: https://codereview.chromium.org/106183007
git-svn-id: http://skia.googlecode.com/svn/trunk@12552 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/core/SkPixelRef.cpp')
-rw-r--r-- | src/core/SkPixelRef.cpp | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/src/core/SkPixelRef.cpp b/src/core/SkPixelRef.cpp index 1afc3360a2..b5daf0b57a 100644 --- a/src/core/SkPixelRef.cpp +++ b/src/core/SkPixelRef.cpp @@ -82,6 +82,28 @@ void SkPixelRef::setMutex(SkBaseMutex* mutex) { // just need a > 0 value, so pick a funny one to aid in debugging #define SKPIXELREF_PRELOCKED_LOCKCOUNT 123456789 +SkPixelRef::SkPixelRef(const SkImageInfo&, SkBaseMutex* mutex) { + this->setMutex(mutex); + fPixels = NULL; + fColorTable = NULL; // we do not track ownership of this + fLockCount = 0; + this->needsNewGenID(); + fIsImmutable = false; + fPreLocked = false; +} + +SkPixelRef::SkPixelRef(const SkImageInfo&) { + this->setMutex(NULL); + fPixels = NULL; + fColorTable = NULL; // we do not track ownership of this + fLockCount = 0; + this->needsNewGenID(); + fIsImmutable = false; + fPreLocked = false; +} + +#ifdef SK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR +// THIS GUY IS DEPRECATED -- don't use me! SkPixelRef::SkPixelRef(SkBaseMutex* mutex) { this->setMutex(mutex); fPixels = NULL; @@ -91,6 +113,7 @@ SkPixelRef::SkPixelRef(SkBaseMutex* mutex) { fIsImmutable = false; fPreLocked = false; } +#endif SkPixelRef::SkPixelRef(SkFlattenableReadBuffer& buffer, SkBaseMutex* mutex) : INHERITED(buffer) { |