From 4500a8d5d7fbec9dba5e693212da160849e401ff Mon Sep 17 00:00:00 2001 From: Romain Guy Date: Tue, 26 Mar 2013 17:29:51 -0700 Subject: Path precaching creates duplicate cache entries Bug #8478275 Change-Id: Ib541ea051e42e01cc0d277790e9c09de38ef72ee --- libs/hwui/PathCache.h | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'libs/hwui/PathCache.h') diff --git a/libs/hwui/PathCache.h b/libs/hwui/PathCache.h index 146723162fa5..dd1f9967ca43 100644 --- a/libs/hwui/PathCache.h +++ b/libs/hwui/PathCache.h @@ -253,7 +253,13 @@ private: PathTexture* addTexture(const PathDescription& entry, const SkPath *path, const SkPaint* paint); PathTexture* addTexture(const PathDescription& entry, SkBitmap* bitmap); - void addTexture(const PathDescription& entry, SkBitmap* bitmap, PathTexture* texture); + + /** + * Generates the texture from a bitmap into the specified texture structure. + */ + void generateTexture(SkBitmap& bitmap, Texture* texture); + void generateTexture(const PathDescription& entry, SkBitmap* bitmap, PathTexture* texture, + bool addToCache = true); PathTexture* get(const PathDescription& entry) { return mCache.get(entry); @@ -282,11 +288,6 @@ private: return true; } - /** - * Generates the texture from a bitmap into the specified texture structure. - */ - void generateTexture(SkBitmap& bitmap, Texture* texture); - void init(); class PathTask: public Task { -- cgit v1.2.3-59-g8ed1b