Fix two leaks & improve leak tracking

include/core/SkDocument.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 SkDocument_DEFINED
 #define SkDocument_DEFINED
 
 #include "SkRect.h"
 #include "SkRefCnt.h"
 
 class SkCanvas;
 class SkWStream;
 
 /**
  *  High-level API for creating a document-based canvas. To use..
  *
  *  1. Create a document, specifying a stream to store the output.
  *  2. For each "page" of content:
  *      a. canvas = doc->beginPage(...)
  *      b. draw_my_content(canvas);
  *      c. doc->endPage();
  *  3. Close the document with doc->close().
  */
 class SkDocument : public SkRefCnt {
 public:
+    SK_DECLARE_INST_COUNT(SkDocument)
+
     /**
      *  Create a PDF-backed document, writing the results into a file.
      *  If there is an error trying to create the doc, returns NULL.
      */
     static SkDocument* CreatePDF(const char filename[]);
 
     /**
      *  Create a PDF-backed document, writing the results into a stream.
      *  If there is an error trying to create the doc, returns NULL.
      *
@@ skipping 43 matching lines @@
         kBetweenPages_State,
         kInPage_State,
         kClosed_State
     };
     State getState() const { return fState; }
 
 private:
     SkWStream* fStream;
     void       (*fDoneProc)(SkWStream*);
     State      fState;
+
+    typedef SkRefCnt INHERITED;
 };
 
 #endif