diff options
author | Matt Sarett <msarett@google.com> | 2017-05-01 10:22:31 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-05-01 15:01:05 +0000 |
commit | f758311c7362d9232b98b6519ec0af1f71ad02f8 (patch) | |
tree | f22ceecc807e265f8f09ef4932afb8757af3e00e /src/core | |
parent | 38a56016b15b989764e855a1d1259aabd67bec72 (diff) |
Only store width and height on SkPixelRef (part 2)
Relanding https://skia-review.googlesource.com/c/14105/
in pieces to try to diagnose problems with the Chrome
roll.
Bug: skia:6535
Change-Id: Iada034fc41ef315f7f00984d8de9d9cc2f361ad2
Reviewed-on: https://skia-review.googlesource.com/14657
Commit-Queue: Matt Sarett <msarett@google.com>
Reviewed-by: Mike Reed <reed@google.com>
Diffstat (limited to 'src/core')
-rw-r--r-- | src/core/SkBitmap.cpp | 29 | ||||
-rw-r--r-- | src/core/SkMallocPixelRef.cpp | 4 | ||||
-rw-r--r-- | src/core/SkPixelRef.cpp | 47 |
3 files changed, 43 insertions, 37 deletions
diff --git a/src/core/SkBitmap.cpp b/src/core/SkBitmap.cpp index 1ba2968466..5969a73a05 100644 --- a/src/core/SkBitmap.cpp +++ b/src/core/SkBitmap.cpp @@ -198,32 +198,15 @@ void SkBitmap::setPixelRef(sk_sp<SkPixelRef> pr, int dx, int dy) { #ifdef SK_DEBUG if (pr) { if (kUnknown_SkColorType != fInfo.colorType()) { - const SkImageInfo& prInfo = pr->info(); - SkASSERT(fInfo.width() <= prInfo.width()); - SkASSERT(fInfo.height() <= prInfo.height()); - SkASSERT(fInfo.colorType() == prInfo.colorType()); - switch (prInfo.alphaType()) { - case kUnknown_SkAlphaType: - SkASSERT(fInfo.alphaType() == kUnknown_SkAlphaType); - break; - case kOpaque_SkAlphaType: - case kPremul_SkAlphaType: - SkASSERT(fInfo.alphaType() == kOpaque_SkAlphaType || - fInfo.alphaType() == kPremul_SkAlphaType); - break; - case kUnpremul_SkAlphaType: - SkASSERT(fInfo.alphaType() == kOpaque_SkAlphaType || - fInfo.alphaType() == kUnpremul_SkAlphaType); - break; - } + SkASSERT(fInfo.width() + dx <= pr->width()); + SkASSERT(fInfo.height() + dy <= pr->height()); } } #endif fPixelRef = std::move(pr); if (fPixelRef) { - const SkImageInfo& info = fPixelRef->info(); - fPixelRefOrigin.set(SkTPin(dx, 0, info.width()), SkTPin(dy, 0, info.height())); + fPixelRefOrigin.set(SkTPin(dx, 0, fPixelRef->width()), SkTPin(dy, 0, fPixelRef->height())); this->updatePixelsFromRef(); } else { // ignore dx,dy if there is no pixelref @@ -843,7 +826,7 @@ bool SkBitmap::ReadRawPixels(SkReadBuffer* buffer, SkBitmap* bitmap) { if (!pr) { return false; } - bitmap->setInfo(pr->info()); + bitmap->setInfo(info); bitmap->setPixelRef(std::move(pr), 0, 0); return true; } @@ -883,8 +866,8 @@ void SkBitmap::validate() const { SkASSERT(fPixelRef->rowBytes() == fRowBytes); SkASSERT(fPixelRefOrigin.fX >= 0); SkASSERT(fPixelRefOrigin.fY >= 0); - SkASSERT(fPixelRef->info().width() >= (int)this->width() + fPixelRefOrigin.fX); - SkASSERT(fPixelRef->info().height() >= (int)this->height() + fPixelRefOrigin.fY); + SkASSERT(fPixelRef->width() >= (int)this->width() + fPixelRefOrigin.fX); + SkASSERT(fPixelRef->height() >= (int)this->height() + fPixelRefOrigin.fY); SkASSERT(fPixelRef->rowBytes() >= fInfo.minRowBytes()); } } diff --git a/src/core/SkMallocPixelRef.cpp b/src/core/SkMallocPixelRef.cpp index cdc555b748..36b790f8c6 100644 --- a/src/core/SkMallocPixelRef.cpp +++ b/src/core/SkMallocPixelRef.cpp @@ -167,7 +167,3 @@ SkMallocPixelRef::~SkMallocPixelRef() { fReleaseProc(this->pixels(), fReleaseProcContext); } } - -size_t SkMallocPixelRef::getAllocatedSizeInBytes() const { - return this->info().getSafeSize(this->rowBytes()); -} diff --git a/src/core/SkPixelRef.cpp b/src/core/SkPixelRef.cpp index c6d59eab19..143abbc5cf 100644 --- a/src/core/SkPixelRef.cpp +++ b/src/core/SkPixelRef.cpp @@ -26,6 +26,10 @@ uint32_t SkNextID::ImageID() { /////////////////////////////////////////////////////////////////////////////// +#ifdef SK_TRACE_PIXELREF_LIFETIME + static int32_t gInstCounter; +#endif + static SkImageInfo validate_info(const SkImageInfo& info) { SkAlphaType newAlphaType = info.alphaType(); SkAssertResult(SkColorTypeValidateAlphaType(info.colorType(), info.alphaType(), &newAlphaType)); @@ -43,10 +47,6 @@ static void validate_pixels_ctable(const SkImageInfo& info, const SkColorTable* } } -#ifdef SK_TRACE_PIXELREF_LIFETIME - static int32_t gInstCounter; -#endif - SkPixelRef::SkPixelRef(const SkImageInfo& info, void* pixels, size_t rowBytes, sk_sp<SkColorTable> ctable) : fInfo(validate_info(info)) @@ -68,6 +68,25 @@ SkPixelRef::SkPixelRef(const SkImageInfo& info, void* pixels, size_t rowBytes, fAddedToCache.store(false); } +SkPixelRef::SkPixelRef(int width, int height, void* pixels, size_t rowBytes, + sk_sp<SkColorTable> ctable) + : fInfo(SkImageInfo::MakeUnknown(width, height)) + , fCTable(std::move(ctable)) + , fPixels(pixels) + , fRowBytes(rowBytes) +#ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK + , fStableID(SkNextID::ImageID()) +#endif +{ +#ifdef SK_TRACE_PIXELREF_LIFETIME + SkDebugf(" pixelref %d\n", sk_atomic_inc(&gInstCounter)); +#endif + + this->needsNewGenID(); + fMutability = kMutable; + fAddedToCache.store(false); +} + SkPixelRef::~SkPixelRef() { #ifdef SK_TRACE_PIXELREF_LIFETIME SkDebugf("~pixelref %d\n", sk_atomic_dec(&gInstCounter) - 1); @@ -76,11 +95,10 @@ SkPixelRef::~SkPixelRef() { } #ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK + // This is undefined if there are clients in-flight trying to use us void SkPixelRef::android_only_reset(const SkImageInfo& info, size_t rowBytes, sk_sp<SkColorTable> ctable) { - validate_pixels_ctable(info, ctable.get()); - *const_cast<SkImageInfo*>(&fInfo) = info; fRowBytes = rowBytes; fCTable = std::move(ctable); @@ -89,6 +107,19 @@ void SkPixelRef::android_only_reset(const SkImageInfo& info, size_t rowBytes, // conservative, since its possible the "new" settings are the same as the old. this->notifyPixelsChanged(); } + +// This is undefined if there are clients in-flight trying to use us +void SkPixelRef::android_only_reset(int width, int height, size_t rowBytes, + sk_sp<SkColorTable> ctable) { + *const_cast<SkImageInfo*>(&fInfo) = fInfo.makeWH(width, height); + fRowBytes = rowBytes; + fCTable = std::move(ctable); + // note: we do not change fPixels + + // conservative, since its possible the "new" settings are the same as the old. + this->notifyPixelsChanged(); +} + #endif void SkPixelRef::needsNewGenID() { @@ -179,7 +210,3 @@ void SkPixelRef::restoreMutability() { } void SkPixelRef::onNotifyPixelsChanged() { } - -size_t SkPixelRef::getAllocatedSizeInBytes() const { - return 0; -} |