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

include/pdf/SkPDFDevice.h

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #ifndef SkPDFDevice_DEFINED
 #define SkPDFDevice_DEFINED
 
 #include "SkBitmapDevice.h"
+#include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkPaint.h"
 #include "SkPath.h"
 #include "SkPicture.h"
 #include "SkRect.h"
 #include "SkRefCnt.h"
 #include "SkStream.h"
 #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;
 class SkPDFFont;
 class SkPDFFormXObject;
 class SkPDFGlyphSetMap;
 class SkPDFGraphicState;
 class SkPDFObject;
 class SkPDFResourceDict;
 class SkPDFShader;
@@ skipping 22 matching lines @@
      *         This may be useful to, for example, move the origin in and
      *         over a bit to account for a margin, scale the canvas,
      *         or apply a rotation.  Note1: the SkPDFDevice also applies
      *         a scale+translate transform to move the origin from the
      *         bottom left (PDF default) to the top left.  Note2: drawDevice
      *         (used by layer restore) draws the device after this initial
      *         transform is applied, so the PDF device does an
      *         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();
 
     virtual uint32_t getDeviceCapabilities() SK_OVERRIDE;
 
     virtual void clear(SkColor color) SK_OVERRIDE;
 
     /** These are called inside the per-device-layer loop for each draw call.
      When these are called, we have already applied any saveLayer operations,
@@ skipping 227 matching lines @@
                                const SkMatrix& matrix, const SkPaint& paint);
     SkPDFDict* createLinkAnnotation(const SkRect& r, const SkMatrix& matrix);
     void handleLinkToURL(SkData* urlData, const SkRect& r,
                          const SkMatrix& matrix);
     void handleLinkToNamedDest(SkData* nameData, const SkRect& r,
                                const SkMatrix& matrix);
     void defineNamedDestination(SkData* nameData, const SkPoint& point,
                                 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