Fix two leaks & improve leak tracking

include/ports/SkFontMgr.h

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkFontMgr_DEFINED
 #define SkFontMgr_DEFINED
 
 #include "SkRefCnt.h"
 #include "SkFontStyle.h"
 
 class SkData;
 class SkStream;
 class SkString;
 class SkTypeface;
 
 class SK_API SkFontStyleSet : public SkRefCnt {
 public:
+    SK_DECLARE_INST_COUNT(SkFontStyleSet)
+
     virtual int count() = 0;
     virtual void getStyle(int index, SkFontStyle*, SkString* style) = 0;
     virtual SkTypeface* createTypeface(int index) = 0;
     virtual SkTypeface* matchStyle(const SkFontStyle& pattern) = 0;
 
     static SkFontStyleSet* CreateEmpty();
+
+private:
+    typedef SkRefCnt INHERITED;
 };
 
 class SK_API SkFontMgr : public SkRefCnt {
 public:
+    SK_DECLARE_INST_COUNT(SkFontMgr)
+
     int countFamilies();
     void getFamilyName(int index, SkString* familyName);
     SkFontStyleSet* createStyleSet(int index);
 
     SkFontStyleSet* matchFamily(const char familyName[]);
 
     /**
      *  Find the closest matching typeface to the specified familyName and style
      *  and return a ref to it. The caller must call unref() on the returned
      *  object. Will never return NULL, as it will return the default font if
@@ skipping 48 matching lines @@
     virtual SkTypeface* onCreateFromFile(const char path[], int ttcIndex) = 0;
 
 private:
     static SkFontMgr* Factory();    // implemented by porting layer
     static SkMutex* Mutex();        // implemented by porting layer
 
     typedef SkRefCnt INHERITED;
 };
 
 #endif