Revert of Use SkBitmapCache to optimize readPixels on a texture-backed bitmap (patchset #6 id:100001 of https://codereview.chromium.org/533323002/)
Reason for revert:
Component inversions in Blink's printing/webgl-repeated-printing.html: https://storage.googleapis.com/chromium-layout-test-archives/linux_blink_rel/24033/layout-test-results/printing/webgl-repeated-printing-diff.txt
Reverting to unblock rolls.
Original issue's description:
> Use SkBitmapCache to optimize readPixels on a texture-backed bitmap
>
> BUG=skia:2786
>
> Committed: https://skia.googlesource.com/skia/+/95fd68e5ccd242a91e6dd827dd695f18661efbe6
R=junov@chromium.org, reed@google.com, bsalomon@google.com, piotaixr@chromium.org
TBR=bsalomon@google.com, junov@chromium.org, piotaixr@chromium.org, reed@google.com
NOTREECHECKS=true
NOTRY=true
BUG=skia:2786
Author: fmalita@chromium.org
Review URL: https://codereview.chromium.org/551523003
diff --git a/src/gpu/SkGrPixelRef.cpp b/src/gpu/SkGrPixelRef.cpp
index 8b68448..d5be965 100644
--- a/src/gpu/SkGrPixelRef.cpp
+++ b/src/gpu/SkGrPixelRef.cpp
@@ -9,10 +9,8 @@
#include "SkGrPixelRef.h"
-
#include "GrContext.h"
#include "GrTexture.h"
-#include "SkBitmapCache.h"
#include "SkGr.h"
#include "SkRect.h"
@@ -145,7 +143,7 @@
if (NULL == fSurface) {
return NULL;
}
-
+
// Note that when copying a render-target-backed pixel ref, we
// return a texture-backed pixel ref instead. This is because
// render-target pixel refs are usually created in conjunction with
@@ -155,59 +153,30 @@
return copyToTexturePixelRef(fSurface->asTexture(), dstCT, subset);
}
-static bool tryAllocBitmapPixels(SkBitmap* bitmap) {
- SkBitmap::Allocator* allocator = SkBitmapCache::GetAllocator();
- if (NULL != allocator) {
- return allocator->allocPixelRef(bitmap, 0);
- } else {
- // DiscardableMemory is not available, fallback to default allocator
- return bitmap->tryAllocPixels();
- }
-}
-
bool SkGrPixelRef::onReadPixels(SkBitmap* dst, const SkIRect* subset) {
if (NULL == fSurface || fSurface->wasDestroyed()) {
return false;
}
- SkIRect bounds;
+ int left, top, width, height;
if (subset) {
- bounds = *subset;
+ left = subset->fLeft;
+ width = subset->width();
+ top = subset->fTop;
+ height = subset->height();
} else {
- bounds = SkIRect::MakeWH(this->info().width(), this->info().height());
+ left = 0;
+ width = this->info().width();
+ top = 0;
+ height = this->info().height();
}
-
- //Check the cache
- if(!SkBitmapCache::Find(this->getGenerationID(), bounds, dst)) {
- //Cache miss
-
- SkBitmap cachedBitmap;
- cachedBitmap.setInfo(this->info().makeWH(bounds.width(), bounds.height()));
-
- // If we can't alloc the pixels, then fail
- if (!tryAllocBitmapPixels(&cachedBitmap)) {
- return false;
- }
-
- // Try to read the pixels from the surface
- void* buffer = cachedBitmap.getPixels();
- bool readPixelsOk = fSurface->readPixels(bounds.fLeft, bounds.fTop,
- bounds.width(), bounds.height(),
+ if (!dst->tryAllocN32Pixels(width, height)) {
+ SkDebugf("SkGrPixelRef::onReadPixels failed to alloc bitmap for result!\n");
+ return false;
+ }
+ SkAutoLockPixels al(*dst);
+ void* buffer = dst->getPixels();
+ return fSurface->readPixels(left, top, width, height,
kSkia8888_GrPixelConfig,
- buffer, cachedBitmap.rowBytes());
-
- if (!readPixelsOk) {
- return false;
- }
-
- // If we are here, pixels were read correctly from the surface.
- cachedBitmap.setImmutable();
- //Add to the cache
- SkBitmapCache::Add(this->getGenerationID(), bounds, cachedBitmap);
-
- dst->swap(cachedBitmap);
- }
-
- return true;
-
+ buffer, dst->rowBytes());
}