SkPdf: SkPDFFormXObject de-class-ified.

src/pdf/SkPDFDevice.h

Index: src/pdf/SkPDFDevice.h
diff --git a/src/pdf/SkPDFDevice.h b/src/pdf/SkPDFDevice.h
index 6a167d979ac9e2869cfcf09d58d87192a04ba042..d5d52f98e350a93d8f64e664f325f9aed5c917d0 100644
--- a/src/pdf/SkPDFDevice.h
+++ b/src/pdf/SkPDFDevice.h
@@ -29,8 +29,8 @@ class SkPDFDevice;
 class SkPDFDocument;
 class SkPDFDict;
 class SkPDFFont;
-class SkPDFFormXObject;
 class SkPDFObject;
+class SkPDFStream;
 class SkRRect;
 
 /** \class SkPDFDevice
@@ -268,10 +268,10 @@ private:
 
     void init();
     void cleanUp();
-    SkPDFFormXObject* createFormXObjectFromDevice();
+    sk_sp<SkPDFObject> makeFormXObjectFromDevice();
 
     void drawFormXObjectWithMask(int xObjectIndex,
-                                 SkPDFFormXObject* mask,
+                                 SkPDFObject* mask,
                                  const SkClipStack* clipStack,
                                  const SkRegion& clipRegion,
                                  SkXfermode::Mode mode,
@@ -286,9 +286,9 @@ private:
                                     const SkMatrix& matrix,
                                     const SkPaint& paint,
                                     bool hasText,
-                                    SkPDFFormXObject** dst);
+                                    SkPDFObject** dst);
     void finishContentEntry(SkXfermode::Mode xfermode,
-                            SkPDFFormXObject* dst,
+                            SkPDFObject* dst,
                             SkPath* shape);
     bool isContentEmpty();