Fix two leaks & improve leak tracking

src/core/SkFontHost.cpp

 /*
  * Copyright 2009 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkFontLCDConfig.h"
 
 static SkFontLCDConfig::LCDOrientation gLCDOrientation = SkFontLCDConfig::kHorizontal_LCDOrientation;
@@ skipping 50 matching lines @@
 
 SkFontStyle::SkFontStyle(int weight, int width, Slant slant) {
     fUnion.fU32 = 0;
     fUnion.fR.fWeight = SkPin32(weight, kThin_Weight, kBlack_Weight);
     fUnion.fR.fWidth = SkPin32(width, kUltraCondensed_Width, kUltaExpanded_Width);
     fUnion.fR.fSlant = SkPin32(slant, kUpright_Slant, kItalic_Slant);
 }
 
 #include "SkFontMgr.h"
 
+
+SK_DEFINE_INST_COUNT(SkFontStyleSet)
+
 class SkEmptyFontStyleSet : public SkFontStyleSet {
 public:
     virtual int count() SK_OVERRIDE { return 0; }
     virtual void getStyle(int, SkFontStyle*, SkString*) SK_OVERRIDE {
         SkASSERT(!"SkFontStyleSet::getStyle called on empty set");
     }
     virtual SkTypeface* createTypeface(int index) SK_OVERRIDE {
         SkASSERT(!"SkFontStyleSet::createTypeface called on empty set");
         return NULL;
     }
     virtual SkTypeface* matchStyle(const SkFontStyle&) SK_OVERRIDE {
         return NULL;
     }
 };
 
 SkFontStyleSet* SkFontStyleSet::CreateEmpty() {
     return SkNEW(SkEmptyFontStyleSet);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
+SK_DEFINE_INST_COUNT(SkFontMgr)
+
 class SkEmptyFontMgr : public SkFontMgr {
 protected:
     virtual int onCountFamilies() SK_OVERRIDE {
         return 0;
     }
     virtual void onGetFamilyName(int index, SkString* familyName) SK_OVERRIDE {
         SkASSERT(!"onGetFamilyName called with bad index");
     }
     virtual SkFontStyleSet* onCreateStyleSet(int index) SK_OVERRIDE {
         SkASSERT(!"onCreateStyleSet called with bad index");
@@ skipping 71 matching lines @@
     static SkFontMgr* gFM;
     if (NULL == gFM) {
         gFM = SkFontMgr::Factory();
         // we never want to return NULL
         if (NULL == gFM) {
             gFM = SkNEW(SkEmptyFontMgr);
         }
     }
     return SkRef(gFM);
 }