From 555e74f6fbd9acad79411f72342759ba2ee51b16 Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Tue, 20 May 2014 12:39:37 +0000 Subject: [PATCH] "Revert of eliminate config param -- it was always self's config (https://codereview.chromium.org/246513002/)"" This reverts commit 65b9f33cab9f53821720f982667412e56a340093. git-svn-id: http://skia.googlecode.com/svn/trunk@14795 2bbb7eff-a529-9590-31e7-b0007b416f81 --- include/core/SkPixelRef.h | 3 ++- include/gpu/SkGrPixelRef.h | 2 +- src/core/SkBitmap.cpp | 26 ++++++++++++++++++-------- src/gpu/SkGrPixelRef.cpp | 9 +++++---- 4 files changed, 26 insertions(+), 14 deletions(-) diff --git a/include/core/SkPixelRef.h b/include/core/SkPixelRef.h index 579ca5b..8319ec6 100644 --- a/include/core/SkPixelRef.h +++ b/include/core/SkPixelRef.h @@ -223,13 +223,14 @@ public: /** * Makes a deep copy of this PixelRef, respecting the requested config. + * @param config Desired config. * @param subset Subset of this PixelRef to copy. Must be fully contained within the bounds of * of this PixelRef. * @return A new SkPixelRef, or NULL if either there is an error (e.g. the destination could * not be created with the given config), or this PixelRef does not support deep * copies. */ - virtual SkPixelRef* deepCopy(const SkIRect* subset = NULL) { + virtual SkPixelRef* deepCopy(SkBitmap::Config config, const SkIRect* subset = NULL) { return NULL; } diff --git a/include/gpu/SkGrPixelRef.h b/include/gpu/SkGrPixelRef.h index 702a3bf..1e49561 100644 --- a/include/gpu/SkGrPixelRef.h +++ b/include/gpu/SkGrPixelRef.h @@ -56,7 +56,7 @@ public: protected: // overrides from SkPixelRef virtual bool onReadPixels(SkBitmap* dst, const SkIRect* subset) SK_OVERRIDE; - virtual SkPixelRef* deepCopy(const SkIRect* subset) SK_OVERRIDE; + virtual SkPixelRef* deepCopy(SkBitmap::Config dstConfig, const SkIRect* subset) SK_OVERRIDE; private: GrSurface* fSurface; diff --git a/src/core/SkBitmap.cpp b/src/core/SkBitmap.cpp index 2d3391f..84f363e 100644 --- a/src/core/SkBitmap.cpp +++ b/src/core/SkBitmap.cpp @@ -885,7 +885,7 @@ bool SkBitmap::extractSubset(SkBitmap* result, const SkIRect& subset) const { if (fPixelRef->getTexture() != NULL) { // Do a deep copy - SkPixelRef* pixelRef = fPixelRef->deepCopy(&subset); + SkPixelRef* pixelRef = fPixelRef->deepCopy(this->config(), &subset); if (pixelRef != NULL) { SkBitmap dst; dst.setConfig(this->config(), subset.width(), subset.height(), 0, @@ -1085,7 +1085,8 @@ bool SkBitmap::copyTo(SkBitmap* dst, SkColorType dstColorType, } bool SkBitmap::deepCopyTo(SkBitmap* dst) const { - const SkColorType dstCT = this->colorType(); + const SkBitmap::Config dstConfig = this->config(); + const SkColorType dstCT = SkBitmapConfigToColorType(dstConfig); if (!this->canCopyTo(dstCT)) { return false; @@ -1094,15 +1095,24 @@ bool SkBitmap::deepCopyTo(SkBitmap* dst) const { // If we have a PixelRef, and it supports deep copy, use it. // Currently supported only by texture-backed bitmaps. if (fPixelRef) { - SkPixelRef* pixelRef = fPixelRef->deepCopy(); + SkPixelRef* pixelRef = fPixelRef->deepCopy(dstConfig); if (pixelRef) { - // Since there is no subset to pass to deepCopy, and deepCopy - // succeeded, the new pixel ref must be identical. - SkASSERT(fPixelRef->info() == pixelRef->info()); - pixelRef->cloneGenID(*fPixelRef); + uint32_t rowBytes; + if (this->colorType() == dstCT) { + // Since there is no subset to pass to deepCopy, and deepCopy + // succeeded, the new pixel ref must be identical. + SkASSERT(fPixelRef->info() == pixelRef->info()); + pixelRef->cloneGenID(*fPixelRef); + // Use the same rowBytes as the original. + rowBytes = fRowBytes; + } else { + // With the new config, an appropriate fRowBytes will be computed by setConfig. + rowBytes = 0; + } SkImageInfo info = fInfo; - if (!dst->setConfig(info, fRowBytes)) { + info.fColorType = dstCT; + if (!dst->setConfig(info, rowBytes)) { return false; } dst->setPixelRef(pixelRef, fPixelRefOrigin)->unref(); diff --git a/src/gpu/SkGrPixelRef.cpp b/src/gpu/SkGrPixelRef.cpp index 85de285..fd21f10 100644 --- a/src/gpu/SkGrPixelRef.cpp +++ b/src/gpu/SkGrPixelRef.cpp @@ -51,7 +51,8 @@ bool SkROLockPixelsPixelRef::onLockPixelsAreWritable() const { /////////////////////////////////////////////////////////////////////////////// -static SkGrPixelRef* copyToTexturePixelRef(GrTexture* texture, const SkIRect* subset) { +static SkGrPixelRef* copyToTexturePixelRef(GrTexture* texture, SkBitmap::Config dstConfig, + const SkIRect* subset) { if (NULL == texture) { return NULL; } @@ -76,7 +77,7 @@ static SkGrPixelRef* copyToTexturePixelRef(GrTexture* texture, const SkIRect* su topLeft = NULL; } desc.fFlags = kRenderTarget_GrTextureFlagBit | kNoStencil_GrTextureFlagBit; - desc.fConfig = texture->config(); + desc.fConfig = SkBitmapConfig2GrPixelConfig(dstConfig); SkImageInfo info; if (!GrPixelConfig2ColorType(desc.fConfig, &info.fColorType)) { @@ -151,7 +152,7 @@ GrTexture* SkGrPixelRef::getTexture() { return NULL; } -SkPixelRef* SkGrPixelRef::deepCopy(const SkIRect* subset) { +SkPixelRef* SkGrPixelRef::deepCopy(SkBitmap::Config dstConfig, const SkIRect* subset) { if (NULL == fSurface) { return NULL; } @@ -162,7 +163,7 @@ SkPixelRef* SkGrPixelRef::deepCopy(const SkIRect* subset) { // a GrTexture owned elsewhere (e.g., SkGpuDevice), and cannot live // independently of that texture. Texture-backed pixel refs, on the other // hand, own their GrTextures, and are thus self-contained. - return copyToTexturePixelRef(fSurface->asTexture(), subset); + return copyToTexturePixelRef(fSurface->asTexture(), dstConfig, subset); } bool SkGrPixelRef::onReadPixels(SkBitmap* dst, const SkIRect* subset) { -- 2.7.4