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

remove NewTexture?

Browse Source 
BUG=skia:
TBR=

Review URL: https://codereview.chromium.org/831323005
This commit is contained in:
reed 2015-01-13 04:00:55 -08:00 committed by Commit bot
parent 125ee60ed3
commit 4ef0c8aea2
2 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/core/SkImage.h
View File

@ -47,15 +47,6 @@ public:
static SkImage* NewRasterCopy(const Info&, const void* pixels, size_t rowBytes);
static SkImage* NewRasterData(const Info&, SkData* pixels, size_t rowBytes);
/**
* GrTexture is a more logical parameter for this factory, but its
* interactions with scratch cache still has issues, so for now we take
* SkBitmap instead. This will be changed in the future. skbug.com/1449
*/
static SkImage* NewTexture(const SkBitmap&);
virtual bool isOpaque() const { return false; }
/**
* Construct a new SkImage based on the given ImageGenerator.
* This function will always take ownership of the passed
@ -75,6 +66,7 @@ public:
int width() const { return fWidth; }
int height() const { return fHeight; }
uint32_t uniqueID() const { return fUniqueID; }
virtual bool isOpaque() const { return false; }
/**
* Return the GrTexture that stores the image pixels. Calling getTexture

4
src/image/SkImage_Gpu.cpp
View File

@ -93,10 +93,6 @@ SkImage* SkNewImageFromBitmapTexture(const SkBitmap& bitmap, int sampleCountForN
return SkNEW_ARGS(SkImage_Gpu, (bitmap, sampleCountForNewSurfaces));
}
SkImage* SkImage::NewTexture(const SkBitmap& bitmap) {
return SkNewImageFromBitmapTexture(bitmap, 0);
}
GrTexture* SkTextureImageGetTexture(SkImage* image) {
return ((SkImage_Gpu*)image)->getTexture();
}