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

include/pdf/SkPDFDevice.h

Index: include/pdf/SkPDFDevice.h
diff --git a/include/pdf/SkPDFDevice.h b/include/pdf/SkPDFDevice.h
index 30ec2dc63078967c2e157ac2d02673f95d29179e..3e2241f6ca99515d38c719a693128a2664dc0d73 100644
--- a/include/pdf/SkPDFDevice.h
+++ b/include/pdf/SkPDFDevice.h
@@ -11,6 +11,7 @@
 #define SkPDFDevice_DEFINED
 
 #include "SkBitmapDevice.h"
+#include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkPaint.h"
 #include "SkPath.h"
@@ -21,6 +22,7 @@
 #include "SkTDArray.h"
 #include "SkTemplates.h"
 
+class CanvasTestStep;

[vandebo (ex-Chrome), 2013/10/08 23:37:06]

Extra

[edisonn, 2013/10/09 13:25:55]

removed

 class SkPDFArray;
 class SkPDFDevice;
 class SkPDFDict;
@@ -63,7 +65,7 @@ public:
      *         inverse scale+translate to accommodate the one that SkPDFDevice
      *         always does.
      */
-    // TODO(vandebo): The sizes should be SkSize and not SkISize.
+    // Deprecated, please use SkDocument::CreatePdf() instead.
     SK_API SkPDFDevice(const SkISize& pageSize, const SkISize& contentSize,
                        const SkMatrix& initialTransform);
     SK_API virtual ~SkPDFDevice();
@@ -311,6 +313,11 @@ private:
                                 const SkMatrix& matrix);
 
     typedef SkBitmapDevice INHERITED;
+
+    // TODO(edisonn): Only SkDocument_PDF and SkPDFImageShader should be able to create
+    // an SkPDFDevice
+    friend class SkDocument_PDF;

[vandebo (ex-Chrome), 2013/10/08 23:37:06]

nit: omit the friends until they are needed

[edisonn, 2013/10/09 13:25:55]

Done.

+    friend class SkPDFImageShader;
 };
 
 #endif