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 "SkPDFCallbacks.h"
 #include "SkRect.h"
 #include "SkRefCnt.h"
 #include "SkStream.h"
 #include "SkTDArray.h"
 #include "SkTemplates.h"
 
+class CanvasTestStep;
 class SkPDFArray;
 class SkPDFDevice;
 class SkPDFDict;
 class SkPDFFont;
 class SkPDFFormXObject;
 class SkPDFGlyphSetMap;
 class SkPDFGraphicState;
 class SkPDFObject;
 class SkPDFResourceDict;
 class SkPDFShader;
 class SkPDFStream;
 template <typename T> class SkTSet;
 
+namespace skiatest {
+class Reporter;
+}
+
+namespace sk_tools {
+class PdfRenderer;
+}
 // Private classes.
 struct ContentEntry;
 struct GraphicStateEntry;
 struct NamedDestination;
 
-typedef bool (*EncodeToDCTStream)(SkWStream* stream, const SkBitmap& bitmap, const SkIRect& rect);
-
 /** \class SkPDFDevice
 
     The drawing context for the PDF backend.
 */
 class SkPDFDevice : public SkBitmapDevice {
 public:
     /** Create a PDF drawing context with the given width and height.
      *  72 points/in means letter paper is 612x792.
      *  @param pageSize Page size in points.
      *  @param contentSize The content size of the page in points. This will be
      *         combined with the initial transform to determine the drawing area
      *         (as reported by the width and height methods). Anything outside
      *         of the drawing area will be clipped.
      *  @param initialTransform The initial transform to apply to the page.
      *         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 113 matching lines @@
         return *(fFontGlyphUsage.get());
     }
 
 protected:
     virtual bool onReadPixels(const SkBitmap& bitmap, int x, int y,
                               SkCanvas::Config8888) SK_OVERRIDE;
 
     virtual bool allowImageFilter(SkImageFilter*) SK_OVERRIDE;
 
 private:
+    SK_API SkPDFDevice(const SkSize& trimBox, const SkRect& mediaBox);
+
     // TODO(vandebo): push most of SkPDFDevice's state into a core object in
     // order to get the right access levels without using friend.
     friend class ScopedContentEntry;
 
     SkISize fPageSize;
     SkISize fContentSize;
     SkMatrix fInitialTransform;
     SkClipStack fExistingClipStack;
     SkRegion fExistingClipRegion;
     SkPDFArray* fAnnotations;
@@ skipping 93 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;
+    friend class SkPDFImageShader;
+
+    // TODO(edisonn): these are the entry points building a SkPDFDevice, which is about to get
+    // removed. Listed here for future reference when we will remove the SkPDFDevice's constructor.
+//    friend class SampleWindow;
+//    friend void test_pdf_link_annotations(skiatest::Reporter* reporter);
+//    friend void test_named_destination_annotations(skiatest::Reporter* reporter);
+//    friend void TestPdfDevice(skiatest::Reporter* reporter, CanvasTestStep* testStep);
+//    friend void test_issue1083();
+//    friend void TestImage(skiatest::Reporter* reporter, const SkBitmap& bitmap,
+//                          const char* expected, bool useDCTEncoder);
 };
 
 #endif