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

Narrow the SkImageGenerator interface

Browse Source 
Remove some unused variants of bitmap generation and a helper that
serves no purpose.

BUG=skia:
TBR=reed@google.com

Change-Id: I16022e7f0242c4511eebdc06d890f6bfdf81d1f9
Reviewed-on: https://skia-review.googlesource.com/5229
Commit-Queue: Brian Osman <brianosman@google.com>
Reviewed-by: Matt Sarett <msarett@google.com>
This commit is contained in:
Brian Osman 2016-11-28 11:54:42 -05:00 committed by Skia Commit-Bot
parent 3ab83e2519
commit 1b51c5297e
3 changed files with 1 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gm/pictureimagegenerator.cpp
View File

@ -156,7 +156,7 @@ protected:
SkImageGenerator::NewFromPicture(configs[i].size, fPicture.get(), &m,
p.getAlpha() != 255 ? &p : nullptr));
SkBitmap bm;
gen->generateBitmap(&bm);
gen->generateBitmap(&bm, SkImageInfo::MakeN32Premul(configs[i].size));
const SkScalar x = kDrawSize * (i % kDrawsPerRow);
const SkScalar y = kDrawSize * (i / kDrawsPerRow);

20
include/core/SkImageGenerator.h
View File

@ -123,15 +123,6 @@ public:
*/
bool getYUV8Planes(const SkYUVSizeInfo& sizeInfo, void* planes[3]);
/**
* Returns true if the generate can efficiently return a texture (given the properties of the
* proxy). By default, simple codecs will usually return false, since they must be decoded
* on the CPU and then uploaded to become a texture.
*/
bool canGenerateTexture(const GrContextThreadSafeProxy& proxy) {
return this->onCanGenerateTexture(proxy);
}
/**
* If the generator can natively/efficiently return its pixels as a GPU image (backed by a
* texture) this will return that image. If not, this will return NULL.
@ -250,17 +241,9 @@ public:
static SkImageGenerator* NewFromPicture(const SkISize&, const SkPicture*, const SkMatrix*,
const SkPaint*);
bool tryGenerateBitmap(SkBitmap* bm) {
return this->tryGenerateBitmap(bm, nullptr, nullptr);
}
bool tryGenerateBitmap(SkBitmap* bm, const SkImageInfo& info, SkBitmap::Allocator* allocator) {
return this->tryGenerateBitmap(bm, &info, allocator);
}
void generateBitmap(SkBitmap* bm) {
if (!this->tryGenerateBitmap(bm, nullptr, nullptr)) {
sk_throw();
}
}
void generateBitmap(SkBitmap* bm, const SkImageInfo& info) {
if (!this->tryGenerateBitmap(bm, &info, nullptr)) {
sk_throw();
@ -286,9 +269,6 @@ protected:
return false;
}
virtual bool onCanGenerateTexture(const GrContextThreadSafeProxy&) {
return false;
}
virtual GrTexture* onGenerateTexture(GrContext*, const SkIRect*) {
return nullptr;
}

3
src/core/SkPictureImageGenerator.cpp
View File

@ -26,9 +26,6 @@ protected:
bool onGenerateScaledPixels(const SkISize&, const SkIPoint&, const SkPixmap&) override;
#if SK_SUPPORT_GPU
bool onCanGenerateTexture(const GrContextThreadSafeProxy&) override {
return true;
}
GrTexture* onGenerateTexture(GrContext*, const SkIRect*) override;
#endif