From 6c07daf86c0d3824e1cd88fea455e2dd7b88cbcd Mon Sep 17 00:00:00 2001
From: Romain Guy <romainguy@google.com>
Date: Wed, 4 Aug 2010 15:35:18 -0700
Subject: [PATCH] Fix native crash in SkiaShader.

Bug #2893733

Change-Id: I7feb9ab113fe0012cf9eb271f2b044f12a5c9c4e
---
 libs/hwui/SkiaShader.cpp | 8 --------
 libs/hwui/SkiaShader.h   | 2 --
 2 files changed, 10 deletions(-)

diff --git a/libs/hwui/SkiaShader.cpp b/libs/hwui/SkiaShader.cpp
index fedb56c5fa2f5..fe4b54df52e74 100644
--- a/libs/hwui/SkiaShader.cpp
+++ b/libs/hwui/SkiaShader.cpp
@@ -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);
diff --git a/libs/hwui/SkiaShader.h b/libs/hwui/SkiaShader.h
index c19eac3c67e38..58f2870ac6c64 100644
--- a/libs/hwui/SkiaShader.h
+++ b/libs/hwui/SkiaShader.h
@@ -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);