Fix DocumentTest/SkDocument memory leaks

src/doc/SkDocument.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkDocument.h"
 #include "SkStream.h"
 
 SK_DEFINE_INST_COUNT(SkDocument)
 
-SkDocument::SkDocument(SkWStream* stream, void (*doneProc)(SkWStream*)) {
+SkDocument::SkDocument(SkWStream* stream, void (*doneProc)(SkWStream*, bool)) {
     fStream = stream;   // we do not own this object.
     fDoneProc = doneProc;
     fState = kBetweenPages_State;
 }
 
 SkDocument::~SkDocument() {
     this->close();
 }
 
 SkCanvas* SkDocument::beginPage(SkScalar width, SkScalar height,
@@ skipping 37 matching lines @@
 }
 
 bool SkDocument::close() {
     for (;;) {
         switch (fState) {
             case kBetweenPages_State: {
                 fState = kClosed_State;
                 bool success = this->onClose(fStream);
 
                 if (fDoneProc) {
-                    fDoneProc(fStream);
+                    fDoneProc(fStream, false);
                 }
                 // we don't own the stream, but we mark it NULL since we can
                 // no longer write to it.
                 fStream = NULL;
                 return success;
             }
             case kInPage_State:
                 this->endPage();
                 break;
             case kClosed_State:
                 return false;
         }
     }
 }
 
 void SkDocument::abort() {
+    this->onAbort();
+
     fState = kClosed_State;
+    if (fDoneProc) {
+        fDoneProc(fStream, true);
+    }
+    // we don't own the stream, but we mark it NULL since we can
+    // no longer write to it.
+    fStream = NULL;
 }