AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "Revert of https://codereview.chromium.org/129423002/"

Browse Source 
fixed new api references in unit tests

This reverts commit ffc0058e1fbcbd69617e1f41b2dce5b5765ff99e.

BUG=

Review URL: https://codereview.chromium.org/132643007

git-svn-id: http://skia.googlecode.com/svn/trunk@13057 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
reed@google.com 2014-01-13 20:28:50 +00:00
parent 9b06ba4c91
commit f0b56e7448
15 changed files with 113 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/core/SkBitmap.h
View File

@ -268,6 +268,16 @@ public:
*/
void setPixels(void* p, SkColorTable* ctable = NULL);
/**
* Install the specified pixelref into the bitmap, with an optional rect
* for referencing a subset of the pixels in the pixelref. This sets the
* config/width/height/alphatype of the bitmap to match the pixelref.
*
* The subset rect, if not null, is intersected with the bounds of the
* pixelref (taken from its SkImageInfo).
*/
SkPixelRef* installPixelRef(SkPixelRef*, const SkIRect* subset = NULL);
/** Copies the bitmap's pixels to the location pointed at by dst and returns
true if possible, returns false otherwise.

54
include/core/SkImageInfo.h
View File

@ -109,6 +109,60 @@ struct SkImageInfo {
SkColorType fColorType;
SkAlphaType fAlphaType;
static SkImageInfo Make(int width, int height, SkColorType ct, SkAlphaType at) {
SkASSERT(width >= 0);
SkASSERT(height >= 0);
SkImageInfo info = {
width, height, ct, at
};
return info;
}
/**
* Sets colortype to the native ARGB32 type.
*/
static SkImageInfo MakeN32(int width, int height, SkAlphaType at) {
SkASSERT(width >= 0);
SkASSERT(height >= 0);
SkImageInfo info = {
width, height, kPMColor_SkColorType, at
};
return info;
}
/**
* Sets colortype to the native ARGB32 type, and the alphatype to premul.
*/
static SkImageInfo MakeN32Premul(int width, int height) {
SkASSERT(width >= 0);
SkASSERT(height >= 0);
SkImageInfo info = {
width, height, kPMColor_SkColorType, kPremul_SkAlphaType
};
return info;
}
/**
* Sets colortype to the native ARGB32 type, and the alphatype to opaque.
*/
static SkImageInfo MakeN32Opaque(int width, int height) {
SkASSERT(width >= 0);
SkASSERT(height >= 0);
SkImageInfo info = {
width, height, kPMColor_SkColorType, kOpaque_SkAlphaType
};
return info;
}
static SkImageInfo MakeA8(int width, int height) {
SkASSERT(width >= 0);
SkASSERT(height >= 0);
SkImageInfo info = {
width, height, kAlpha_8_SkColorType, kPremul_SkAlphaType
};
return info;
}
bool isOpaque() const {
return SkAlphaTypeIsOpaque(fAlphaType);
}

24
src/core/SkBitmap.cpp
View File

@ -333,6 +333,30 @@ bool SkBitmap::setAlphaType(SkAlphaType alphaType) {
return true;
}
SkPixelRef* SkBitmap::installPixelRef(SkPixelRef* pr, const SkIRect* subset) {
if (NULL == pr) {
this->reset();
return NULL;
}
const SkImageInfo& info = pr->info();
fConfig = SkColorTypeToBitmapConfig(info.fColorType);
fAlphaType = info.fAlphaType;
fBytesPerPixel = info.bytesPerPixel();
// not known until we're locked
fRowBytes = 0;
SkIRect bounds = { 0, 0, info.fWidth, info.fHeight };
if (subset && !bounds.intersect(*subset)) {
bounds.setEmpty();
}
fWidth = bounds.width();
fHeight = bounds.height();
return this->setPixelRef(pr, bounds.left(), bounds.top());
}
void SkBitmap::updatePixelsFromRef() const {
if (NULL != fPixelRef) {
if (fPixelLockCount > 0) {

10
src/core/SkImageFilterUtils.cpp
View File

@ -15,14 +15,8 @@
#include "SkGr.h"
bool SkImageFilterUtils::WrapTexture(GrTexture* texture, int width, int height, SkBitmap* result) {
SkImageInfo info = {
width,
height,
kPMColor_SkColorType,
kPremul_SkAlphaType,
};
result->setConfig(info);
result->setPixelRef(SkNEW_ARGS(SkGrPixelRef, (info, texture)))->unref();
SkImageInfo info = SkImageInfo::MakeN32Premul(width, height);
result->installPixelRef(SkNEW_ARGS(SkGrPixelRef, (info, texture)))->unref();
return true;
}

10
src/core/SkScaledImageCache.cpp
View File

@ -293,14 +293,10 @@ bool SkScaledImageCacheDiscardableAllocator::allocPixelRef(SkBitmap* bitmap,
return false;
}
SkImageInfo info = {
bitmap->width(),
bitmap->height(),
kPMColor_SkColorType,
bitmap->alphaType()
};
SkImageInfo info = SkImageInfo::MakeN32(bitmap->width(), bitmap->height(),
bitmap->alphaType());
bitmap->setPixelRef(SkNEW_ARGS(SkOneShotDiscardablePixelRef,
bitmap->installPixelRef(SkNEW_ARGS(SkOneShotDiscardablePixelRef,
(info, dm, bitmap->rowBytes())))->unref();
bitmap->lockPixels();
return bitmap->readyToDraw();

6
src/effects/gradients/SkGradientShader.cpp
View File

@ -583,8 +583,7 @@ void SkGradientShaderBase::getGradientTableBitmap(SkBitmap* bitmap) const {
if (fMapper) {
// force our cahce32pixelref to be built
(void)this->getCache32();
bitmap->setConfig(SkBitmap::kARGB_8888_Config, kCache32Count, 1);
bitmap->setPixelRef(fCache32PixelRef);
bitmap->installPixelRef(fCache32PixelRef);
return;
}
@ -624,8 +623,7 @@ void SkGradientShaderBase::getGradientTableBitmap(SkBitmap* bitmap) const {
if (!gCache->find(storage.get(), size, bitmap)) {
// force our cahce32pixelref to be built
(void)this->getCache32();
bitmap->setConfig(SkBitmap::kARGB_8888_Config, kCache32Count, 1);
bitmap->setPixelRef(fCache32PixelRef);
bitmap->installPixelRef(fCache32PixelRef);
gCache->add(storage.get(), size, *bitmap);
}

2
src/image/SkImagePriv.cpp
View File

@ -74,7 +74,7 @@ SkImage* SkNewImageFromBitmap(const SkBitmap& bm, bool canSharePixelRef) {
SkImage* image = NULL;
if (canSharePixelRef || bm.isImmutable()) {
image = SkNewImageFromPixelRef(info, bm.pixelRef(), bm.rowBytes());
image = SkNewImageFromPixelRef(bm.pixelRef());
} else {
bm.lockPixels();
if (bm.getPixels()) {

3
src/image/SkImagePriv.h
View File

@ -18,8 +18,7 @@ extern SkBitmap::Config SkColorTypeToBitmapConfig(SkColorType);
extern bool SkBitmapConfigToColorType(SkBitmap::Config, SkColorType* ctOut);
// Call this if you explicitly want to use/share this pixelRef in the image
extern SkImage* SkNewImageFromPixelRef(const SkImageInfo&, SkPixelRef*,
size_t rowBytes);
extern SkImage* SkNewImageFromPixelRef(SkPixelRef*);
/**
* Examines the bitmap to decide if it can share the existing pixelRef, or

1
src/image/SkImage_Base.h
View File

@ -13,6 +13,7 @@
class SkImage_Base : public SkImage {
public:
SkImage_Base(int width, int height) : INHERITED(width, height) {}
SkImage_Base(const SkImageInfo& info) : INHERITED(info.fWidth, info.fHeight) {}
virtual void onDraw(SkCanvas*, SkScalar x, SkScalar y, const SkPaint*) = 0;
virtual void onDrawRectToRect(SkCanvas*, const SkRect* src,

17
src/image/SkImage_Raster.cpp
View File

@ -58,7 +58,7 @@ public:
virtual bool getROPixels(SkBitmap*) const SK_OVERRIDE;
// exposed for SkSurface_Raster via SkNewImageFromPixelRef
SkImage_Raster(const SkImageInfo&, SkPixelRef*, size_t rowBytes);
SkImage_Raster(SkPixelRef*);
SkPixelRef* getPixelRef() const { return fBitmap.pixelRef(); }
@ -84,18 +84,16 @@ SkImage* SkImage_Raster::NewEmpty() {
SkImage_Raster::SkImage_Raster(const Info& info, SkData* data, size_t rowBytes)
: INHERITED(info.fWidth, info.fHeight) {
fBitmap.setConfig(info, rowBytes);
SkAutoTUnref<SkPixelRef> ref(
SkMallocPixelRef::NewWithData(info, rowBytes, NULL, data, 0));
fBitmap.setPixelRef(ref);
fBitmap.installPixelRef(ref);
fBitmap.setImmutable();
}
SkImage_Raster::SkImage_Raster(const Info& info, SkPixelRef* pr, size_t rowBytes)
: INHERITED(info.fWidth, info.fHeight)
SkImage_Raster::SkImage_Raster(SkPixelRef* pr)
: INHERITED(pr->info())
{
fBitmap.setConfig(info, rowBytes);
fBitmap.setPixelRef(pr);
fBitmap.installPixelRef(pr);
}
SkImage_Raster::~SkImage_Raster() {}
@ -155,9 +153,8 @@ SkImage* SkImage::NewRasterData(const SkImageInfo& info, SkData* pixelData, size
return SkNEW_ARGS(SkImage_Raster, (info, data, rowBytes));
}
SkImage* SkNewImageFromPixelRef(const SkImageInfo& info, SkPixelRef* pr,
size_t rowBytes) {
return SkNEW_ARGS(SkImage_Raster, (info, pr, rowBytes));
SkImage* SkNewImageFromPixelRef(SkPixelRef* pr) {
return SkNEW_ARGS(SkImage_Raster, (pr));
}
SkPixelRef* SkBitmapImageGetPixelRef(SkImage* image) {

9
src/image/SkSurface_Raster.cpp
View File

@ -85,15 +85,12 @@ SkSurface_Raster::SkSurface_Raster(const SkImageInfo& info, void* pixels, size_t
}
SkSurface_Raster::SkSurface_Raster(SkPixelRef* pr)
: INHERITED(pr->info().fWidth, pr->info().fHeight)
: INHERITED(pr->info())
{
const SkImageInfo& info = pr->info();
fBitmap.setConfig(info, info.minRowBytes());
fBitmap.setPixelRef(pr);
fBitmap.installPixelRef(pr);
fWeOwnThePixels = true;
if (!info.isOpaque()) {
if (!pr->info().isOpaque()) {
fBitmap.eraseColor(SK_ColorTRANSPARENT);
}
}

6
src/lazy/SkCachingPixelRef.cpp
View File

@ -12,15 +12,13 @@ bool SkCachingPixelRef::Install(SkImageGenerator* generator,
SkBitmap* dst) {
SkImageInfo info;
SkASSERT(dst != NULL);
if ((NULL == generator)
|| !(generator->getInfo(&info))
|| !dst->setConfig(info, 0)) {
if (!generator || !generator->getInfo(&info)) {
SkDELETE(generator);
return false;
}
SkAutoTUnref<SkCachingPixelRef> ref(SkNEW_ARGS(SkCachingPixelRef,
(info, generator, dst->rowBytes())));
dst->setPixelRef(ref);
dst->installPixelRef(ref);
return true;
}

2
src/lazy/SkDiscardablePixelRef.cpp
View File

@ -94,6 +94,6 @@ bool SkInstallDiscardablePixelRef(SkImageGenerator* generator,
SkAutoTUnref<SkDiscardablePixelRef> ref(
SkNEW_ARGS(SkDiscardablePixelRef,
(info, autoGenerator.detach(), dst->rowBytes(), factory)));
dst->setPixelRef(ref);
dst->installPixelRef(ref);
return true;
}

2
tests/MallocPixelRefTest.cpp
View File

@ -23,7 +23,7 @@ static void set_to_one_proc(void*, void* context) {
*/
DEF_TEST(MallocPixelRef, reporter) {
REPORTER_ASSERT(reporter, true);
SkImageInfo info = {10, 13, kPMColor_SkColorType, kPremul_SkAlphaType};
SkImageInfo info = SkImageInfo::MakeN32Premul(10, 13);
{
SkAutoTUnref<SkMallocPixelRef> pr(
SkMallocPixelRef::NewAllocate(info, info.minRowBytes() - 1, NULL));

2
tests/PixelRefTest.cpp
View File

@ -51,7 +51,7 @@ private:
} // namespace
DEF_TEST(PixelRef_GenIDChange, r) {
SkImageInfo info = { 10, 10, kPMColor_SkColorType, kPremul_SkAlphaType };
SkImageInfo info = SkImageInfo::MakeN32Premul(10, 10);
SkAutoTUnref<SkPixelRef> pixelRef(SkMallocPixelRef::NewAllocate(info, 0, NULL));