Update the SkDocument interface to allow for 1) abort won't emit pdf, 2) close can report success/f…

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*)) {
     fStream = stream;   // we do not own this object.
     fDoneProc = doneProc;
     fState = kBetweenPages_State;
 }
 
 SkDocument::~SkDocument() {
     this->close();
 }
 
-SkCanvas* SkDocument::beginPage(SkScalar width, SkScalar height,
-                                const SkRect* content) {
-    if (width <= 0 || height <= 0) {
+SkCanvas* SkDocument::beginPage(const SkSize& trimSize, const SkRect* mediaBox) {
+    if (trimSize.width() <= 0 || trimSize.height() <= 0) {
         return NULL;
     }
 
-    SkRect outer = SkRect::MakeWH(width, height);
-    SkRect inner;
-    if (content) {
-        inner = *content;
-        if (!inner.intersect(outer)) {

[reed1, 2013/10/07 13:24:54]

Why do we not check for valid mediaBox anymore?

[edisonn, 2013/10/07 19:29:06]

Done.

-            return NULL;
-        }
-    } else {
-        inner = outer;
-    }
-
     for (;;) {
         switch (fState) {
             case kBetweenPages_State:
                 fState = kInPage_State;
-                return this->onBeginPage(width, height, inner);
+                return this->onBeginPage(trimSize, mediaBox);
             case kInPage_State:
                 this->endPage();
                 break;
             case kClosed_State:
                 return NULL;
         }
     }
     SkDEBUGFAIL("never get here");
     return NULL;
 }
 
 void SkDocument::endPage() {
     if (kInPage_State == fState) {
         fState = kBetweenPages_State;
         this->onEndPage();
     }
 }
 
-void SkDocument::close() {
+bool SkDocument::close() {
     for (;;) {
         switch (fState) {
-            case kBetweenPages_State:
+            case kBetweenPages_State: {
                 fState = kClosed_State;
-                this->onClose(fStream);
+                bool success = this->onClose(fStream);
 
                 if (fDoneProc) {
                     fDoneProc(fStream);
                 }
                 // we don't own the stream, but we mark it NULL since we can
                 // no longer write to it.
                 fStream = NULL;
-                return;
+                return success;
+            }
             case kInPage_State:
                 this->endPage();
                 break;
             case kClosed_State:
-                return;
+                return false;
         }
     }
 }
+
+void SkDocument::abort() {
+    fState = kClosed_State;
+}