Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix native crash in SkiaShader.

Browse Source 
Bug #2893733

Change-Id: I7feb9ab113fe0012cf9eb271f2b044f12a5c9c4e
This commit is contained in:
Romain Guy
2010-08-04 15:35:18 -07:00
parent 529b60a3b1
commit 6c07daf86c
2 changed files with 0 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libs/hwui/SkiaShader.cpp
View File

@@ -78,9 +78,6 @@ SkiaBitmapShader::SkiaBitmapShader(SkBitmap* bitmap, SkShader* key, SkShader::Ti
SkiaShader(kBitmap, key, tileX, tileY, matrix, blend), mBitmap(bitmap) {
}
SkiaBitmapShader::~SkiaBitmapShader() {
}
void SkiaBitmapShader::describe(ProgramDescription& description, const Extensions& extensions) {
const Texture* texture = mTextureCache->get(mBitmap);
@@ -190,11 +187,6 @@ SkiaComposeShader::SkiaComposeShader(SkiaShader* first, SkiaShader* second,
NULL, first->blend() || second->blend()), mFirst(first), mSecond(second), mMode(mode) {
}
SkiaComposeShader::~SkiaComposeShader() {
delete mFirst;
delete mSecond;
}
void SkiaComposeShader::set(TextureCache* textureCache, GradientCache* gradientCache) {
SkiaShader::set(textureCache, gradientCache);
mFirst->set(textureCache, gradientCache);

2
libs/hwui/SkiaShader.h
View File

@@ -102,7 +102,6 @@ protected:
struct SkiaBitmapShader: public SkiaShader {
SkiaBitmapShader(SkBitmap* bitmap, SkShader* key, SkShader::TileMode tileX,
SkShader::TileMode tileY, SkMatrix* matrix, bool blend);
~SkiaBitmapShader();
void describe(ProgramDescription& description, const Extensions& extensions);
void setupProgram(Program* program, const mat4& modelView, const Snapshot& snapshot,
@@ -143,7 +142,6 @@ private:
*/
struct SkiaComposeShader: public SkiaShader {
SkiaComposeShader(SkiaShader* first, SkiaShader* second, SkXfermode::Mode mode, SkShader* key);
~SkiaComposeShader();
void set(TextureCache* textureCache, GradientCache* gradientCache);