Fix DocumentTest/SkDocument memory leaks

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
 
@@ skipping 46 matching lines @@
      *  Create a PDF-backed document, writing the results into a stream.
      *  If there is an error trying to create the doc, returns NULL.
      *
      *  The document may write to the stream at anytime during its lifetime,
      *  until either close() is called or the document is deleted. Once close()
      *  has been called, and all of the data has been written to the stream,
      *  if there is a Done proc provided, it will be called with the stream.
      *  The proc can delete the stream, or whatever it needs to do.
      *  encoder sets the DCTEncoder for images, to encode a bitmap
      *    as JPEG (DCT).
+     *  Done - clean up method intended to allow deletion of the stream.
+     *         Its aborted parameter is true if the cleanup is due to an abort
+     *         call. It is false otherwise.
      *  rasterDpi - the DPI at which features without native PDF support
      *              will be rasterized (e.g. draw image with perspective,
      *              draw text with perspective, ...)
      *              A larger DPI would create a PDF that reflects the original
      *              intent with better fidelity, but it can make for larger
      *              PDF files too, which would use more memory while rendering,
      *              and it would be slower to be processed or sent online or
      *              to printer.     */
     static SkDocument* CreatePDF(
-            SkWStream*, void (*Done)(SkWStream*) = NULL,
+            SkWStream*, void (*Done)(SkWStream*,bool aborted) = NULL,
             SkPicture::EncodeBitmap encoder = NULL,
             SkScalar rasterDpi = SK_ScalarDefaultRasterDPI);
 
     /**
      *  Begin a new page for the document, returning the canvas that will draw
      *  into the page. The document owns this canvas, and it will go out of
      *  scope when endPage() or close() is called, or the document is deleted.
      */
     SkCanvas* beginPage(SkScalar width, SkScalar height,
                         const SkRect* content = NULL);
@@ skipping 14 matching lines @@
      */
     bool close();
 
     /**
      *  Call abort() to stop producing the document immediately.
      *  The stream output must be ignored, and should not be trusted.
      */
     void abort();
 
 protected:
-    SkDocument(SkWStream*, void (*)(SkWStream*));
+    SkDocument(SkWStream*, void (*)(SkWStream*, bool aborted));
     // note: subclasses must call close() in their destructor, as the base class
     // cannot do this for them.
     virtual ~SkDocument();
 
     virtual SkCanvas* onBeginPage(SkScalar width, SkScalar height,
                                   const SkRect& content) = 0;
     virtual void onEndPage() = 0;
     virtual bool onClose(SkWStream*) = 0;
     virtual void onAbort() = 0;
 
     enum State {
         kBetweenPages_State,
         kInPage_State,
         kClosed_State
     };
     State getState() const { return fState; }
 
 private:
     SkWStream* fStream;
-    void       (*fDoneProc)(SkWStream*);
+    void       (*fDoneProc)(SkWStream*, bool aborted);
     State      fState;
 
     typedef SkRefCnt INHERITED;
 };
 
 #endif