commit 20ccd40de96ca781dccf5690d215f3369e2a8182
author joshualitt <joshualitt@chromium.org> Tue Jan 05 08:56:56 2016 -0800
committer Commit bot <commit-bot@chromium.org> Tue Jan 05 08:56:56 2016 -0800
tree 9b0322550cb695e7ea9b6e6588209b6ef6e5c830
parent 45eefcfec26ee48c0b2ee1d316aae3c3dc529145

Add assert that memory pool is empty when GrTextBlobCache frees

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1555993005

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

src/gpu/GrDrawingManager.cpp

diff --git a/src/gpu/GrDrawingManager.cpp b/src/gpu/GrDrawingManager.cpp
index 7aa0fdb..2a27f6a 100644
--- a/src/gpu/GrDrawingManager.cpp
+++ b/src/gpu/GrDrawingManager.cpp
@@ -20,6 +20,9 @@
         fDrawTargets[i]->makeClosed();  // no drawTarget should receive a new command after this
         fDrawTargets[i]->clearRT();
 
+        // We shouldn't need to do this, but it turns out some clients still hold onto drawtargets
+        // after a cleanup
+        fDrawTargets[i]->reset();
         fDrawTargets[i]->unref();
     }
 

src/gpu/text/GrTextBlobCache.cpp

diff --git a/src/gpu/text/GrTextBlobCache.cpp b/src/gpu/text/GrTextBlobCache.cpp
index f11b7c6..685284b 100644
--- a/src/gpu/text/GrTextBlobCache.cpp
+++ b/src/gpu/text/GrTextBlobCache.cpp
@@ -55,4 +55,7 @@
         ++iter;
     }
     fCache.rewind();
+
+    // There should be no allocations in the memory pool at this point
+    SkASSERT(fPool.isEmpty());
 }