Merge "Don't invalidate all the glyphs when flushing large textures" into jb-mr1-dev

Romain Guy · Android (Google) Code Review · commit 4a332f5bae18 · 2012-09-05T10:41:39.000-07:00
diff --git a/libs/hwui/font/Font.cpp b/libs/hwui/font/Font.cpp
@@ -51,7 +51,7 @@ Font::~Font() {
 void Font::invalidateTextureCache(CacheTexture* cacheTexture) {
     for (uint32_t i = 0; i < mCachedGlyphs.size(); i++) {
         CachedGlyphInfo* cachedGlyph = mCachedGlyphs.valueAt(i);
-        if (cacheTexture || cachedGlyph->mCacheTexture == cacheTexture) {
+        if (!cacheTexture || cachedGlyph->mCacheTexture == cacheTexture) {
             cachedGlyph->mIsValid = false;
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ Font::~Font() {`
`51`	`51`	`void Font::invalidateTextureCache(CacheTexture* cacheTexture) {`
`52`	`52`	`for (uint32_t i = 0; i < mCachedGlyphs.size(); i++) {`
`53`	`53`	`CachedGlyphInfo* cachedGlyph = mCachedGlyphs.valueAt(i);`
`54`		`- if (cacheTexture \|\| cachedGlyph->mCacheTexture == cacheTexture) {`
	`54`	`+ if (!cacheTexture \|\| cachedGlyph->mCacheTexture == cacheTexture) {`
`55`	`55`	`cachedGlyph->mIsValid = false;`
`56`	`56`	`}`
`57`	`57`	`}`