SkPDF: SkPDFDevice has ptr to SkPDFDocument

src/pdf/SkPDFDevice.h

Index: src/pdf/SkPDFDevice.h
diff --git a/src/pdf/SkPDFDevice.h b/src/pdf/SkPDFDevice.h
index b1345a8e3fbb8e7c85069e62703d649486382d14..8747b081f1be8e54f3834cedac55ccf8d3d3c47d 100644
--- a/src/pdf/SkPDFDevice.h
+++ b/src/pdf/SkPDFDevice.h
@@ -25,6 +25,7 @@
 class SkPDFArray;
 class SkPDFCanon;
 class SkPDFDevice;
+class SkPDFDocument;
 class SkPDFDict;
 class SkPDFFont;
 class SkPDFFormXObject;
@@ -59,20 +60,20 @@ public:
      *         while rendering, and it would be slower to be processed
      *         or sent online or to printer.  A good choice is
      *         SK_ScalarDefaultRasterDPI(72.0f).
-     *  @param SkPDFCanon.  Should be non-null, and shared by all
+     *  @param SkPDFDocument.  Should be non-null, and shared by all
      *         devices in a document.

[tomhudson, 2016/03/21 14:49:48]

This comment doesn't explain to me why. In the old days I might have been able
to go read SkPDFCanon.h and figure out why there was one being provided, but now
I have no clue unless I git into the code far enough that I realize the Canon
off of this Document is being returned by getCanon() and I need to know what
that canon is; even that isn't sufficient for me to know if it's the *only*
reason this Document is being provided.

[hal.canary, 2016/03/21 21:06:02]

better?

@param SkPDFDocument.  A non-null pointer back to the
       document.  The document is repsonsible for
       de-duplicating across pages (via the SkPDFCanon) and
       for early serializing of large immutable objects, such
       as images (via SkPDFDocument::serialize()).

[tomhudson, 2016/03/21 21:09:56]

Yes, thanks.

      */
     static SkPDFDevice* Create(SkISize pageSize,
                                SkScalar rasterDpi,
-                               SkPDFCanon* canon) {
-        return new SkPDFDevice(pageSize, rasterDpi, canon, true);
+                               SkPDFDocument* doc) {
+        return new SkPDFDevice(pageSize, rasterDpi, doc, true);
     }
 
     /** Create a PDF drawing context without fipping the y-axis. */
     static SkPDFDevice* CreateUnflipped(SkISize pageSize,
                                         SkScalar rasterDpi,
-                                        SkPDFCanon* canon) {
-        return new SkPDFDevice(pageSize, rasterDpi, canon, false);
+                                        SkPDFDocument* doc) {
+        return new SkPDFDevice(pageSize, rasterDpi, doc, false);
     }
 
     virtual ~SkPDFDevice();
@@ -184,7 +185,7 @@ public:
         return *(fFontGlyphUsage.get());
     }
 
-    SkPDFCanon* getCanon() const { return fCanon; }
+    SkPDFCanon* getCanon() const;
 
 protected:
     const SkBitmap& onAccessBitmap() override {
@@ -261,12 +262,12 @@ private:
 
     SkBitmap fLegacyBitmap;
 
-    SkPDFCanon* fCanon;  // Owned by SkDocument_PDF
+    SkPDFDocument* fDocument;
     ////////////////////////////////////////////////////////////////////////////
 
     SkPDFDevice(SkISize pageSize,
                 SkScalar rasterDpi,
-                SkPDFCanon* canon,
+                SkPDFDocument* doc,
                 bool flip);
 
     ContentEntry* getLastContentEntry();