commit 9fc5c68823c7e39e4769a41713ce070a7780df29
author bungeman@google.com <bungeman@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue Nov 12 15:25:29 2013 +0000
committer bungeman@google.com <bungeman@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue Nov 12 15:25:29 2013 +0000
tree 535b70eab35005f1185b536479a8cb52495e04f6
parent 940ccc819b821b4e7849491df70f4597318e1fa8

Fix leak detected in FontMgrMatchGM::onDraw by Valgrind.



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

gm/fontmgr.cpp

diff --git a/gm/fontmgr.cpp b/gm/fontmgr.cpp
index 06288b2..4b64821 100644
--- a/gm/fontmgr.cpp
+++ b/gm/fontmgr.cpp
@@ -162,18 +162,16 @@
             "Helvetica Neue", "Arial"
         };
 
-        SkFontStyleSet* fset = NULL;
+        SkAutoTUnref<SkFontStyleSet> fset;
         for (size_t i = 0; i < SK_ARRAY_COUNT(gNames); ++i) {
-            fset = fFM->matchFamily(gNames[i]);
-            if (fset && fset->count() > 0) {
+            fset.reset(fFM->matchFamily(gNames[i]));
+            if (fset->count() > 0) {
                 break;
             }
         }
-
-        if (NULL == fset) {
+        if (NULL == fset.get()) {
             return;
         }
-        SkAutoUnref aur(fset);
 
         canvas->translate(20, 40);
         this->exploreFamily(canvas, paint, fset);