commit bbe55fdf6608b8aec2e5d3945da6b1872b3a380f
author jvanverth@google.com <jvanverth@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon Sep 16 20:28:37 2013 +0000
committer jvanverth@google.com <jvanverth@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon Sep 16 20:28:37 2013 +0000
tree 7331d446ef2c8dc05d0f162fe5cdcf8f74323457
parent a2f4b15d4e861b8b29e20ec37743fd3fd4b05b03

Have multiple plotmgrs, one for each mask format.
Only flush/purge those strikes that match our format.

R=bsalomon@google.com

Review URL: https://codereview.chromium.org/24047005

git-svn-id: http://skia.googlecode.com/svn/trunk@11303 2bbb7eff-a529-9590-31e7-b0007b416f81

src/gpu/GrTextStrike.cpp

diff --git a/src/gpu/GrTextStrike.cpp b/src/gpu/GrTextStrike.cpp
index d3214a7..47b6216 100644
--- a/src/gpu/GrTextStrike.cpp
+++ b/src/gpu/GrTextStrike.cpp
@@ -69,10 +69,12 @@
 }
 
 void GrFontCache::purgeExceptFor(GrTextStrike* preserveStrike) {
+    SkASSERT(NULL != preserveStrike);
     GrTextStrike* strike = fTail;
     bool purge = true;
+    GrMaskFormat maskFormat = preserveStrike->fMaskFormat;
     while (strike) {
-        if (strike == preserveStrike) {
+        if (strike == preserveStrike || maskFormat != strike->fMaskFormat) {
             strike = strike->fPrev;
             continue;
         }
@@ -94,9 +96,11 @@
 }
 
 void GrFontCache::freeAtlasExceptFor(GrTextStrike* preserveStrike) {
+    SkASSERT(NULL != preserveStrike);
     GrTextStrike* strike = fTail;
+    GrMaskFormat maskFormat = preserveStrike->fMaskFormat;
     while (strike) {
-        if (strike == preserveStrike) {
+        if (strike == preserveStrike || maskFormat != strike->fMaskFormat) {
             strike = strike->fPrev;
             continue;
         }