Merge "Fix crash with new LookupGammaFontRenderer Bug #6853934"

Author: Romain Guy

libs/hwui/FontRenderer.cpp

@@ -697,8 +697,7 @@ void FontRenderer::cacheBitmap(const SkGlyph& glyph, CachedGlyphInfo* cachedGlyp
 }
 
 CacheTexture* FontRenderer::createCacheTexture(int width, int height, bool allocate) {
-    uint8_t* textureMemory = NULL;
-    CacheTexture* cacheTexture = new CacheTexture(textureMemory, width, height);
+    CacheTexture* cacheTexture = new CacheTexture(width, height);
 
     if (allocate) {
         allocateTextureMemory(cacheTexture);

libs/hwui/FontRenderer.h

@@ -61,9 +61,8 @@ class FontRenderer;
 
 class CacheTexture {
 public:
-    CacheTexture() { }
-    CacheTexture(uint8_t* texture, uint16_t width, uint16_t height) :
-            mTexture(texture), mTextureId(0), mWidth(width), mHeight(height),
+    CacheTexture(uint16_t width, uint16_t height) :
+            mTexture(NULL), mTextureId(0), mWidth(width), mHeight(height),
             mLinearFiltering(false) { }
     ~CacheTexture() {
         if (mTexture) {

libs/hwui/GammaFontRenderer.h

@@ -59,6 +59,7 @@ class ShaderGammaFontRenderer: public GammaFontRenderer {
 
     void clear() {
         delete mRenderer;
+        mRenderer = NULL;
     }
 
     void flush() {