SkPdf: SkPDFFormXObject de-class-ified.

src/pdf/SkPDFFormXObject.h

Index: src/pdf/SkPDFFormXObject.h
diff --git a/src/pdf/SkPDFFormXObject.h b/src/pdf/SkPDFFormXObject.h
index a483a6046657387cc6f7096dc04c70405d5f9e5a..98df56d8df313be78620455a78e90663a440f2ed 100644
--- a/src/pdf/SkPDFFormXObject.h
+++ b/src/pdf/SkPDFFormXObject.h
@@ -10,41 +10,14 @@
 #define SkPDFFormXObject_DEFINED
 
 #include "SkPDFStream.h"
+#include "SkPDFDevice.h"
 
-class SkPDFArray;
-class SkPDFDevice;
-class SkPDFDict;
-struct SkRect;
-
-/** \class SkPDFFormXObject
-
-    A form XObject; a self contained description of graphics objects.  A form
-    XObject is basically a page object with slightly different syntax, that
-    can be drawn onto a page.
+/** A form XObject is a self contained description of graphics
+    objects.  A form XObject is basically a page object with slightly

[tomhudson, 2016/07/27 20:30:58]

Match tense: is a ... of *a* graphics object.
Cut basically.
Maybe your intended reader understands enough about pages and graphics objects
and relationships within PDF to understand your point here. I don't.

[hal.canary, 2016/07/27 20:41:11]

Done.

+    different syntax, that can be drawn onto a page.
 */
-
-// The caller could keep track of the form XObjects it creates and
-// canonicalize them, but the Skia API doesn't provide enough context to
-// automatically do it (trivially).
-class SkPDFFormXObject final : public SkPDFStream {
-public:
-    /** Create a PDF form XObject. Entries for the dictionary entries are
-     *  automatically added.
-     *  @param device      The set of graphical elements on this form.
-     */
-    explicit SkPDFFormXObject(SkPDFDevice* device);
-    /**
-     * Create a PDF form XObject from a raw content stream and associated
-     * resources.
-     */
-    explicit SkPDFFormXObject(std::unique_ptr<SkStreamAsset> content,
-                              SkRect bbox,
-                              SkPDFDict* resourceDict);
-    virtual ~SkPDFFormXObject();
-
-private:
-    void init(const char* colorSpace,
-              SkPDFDict* resourceDict, SkPDFArray* bbox);
-};
-
+sk_sp<SkPDFObject> SkPDFMakeFormXObject(std::unique_ptr<SkStreamAsset> content,
+                                        sk_sp<SkPDFArray> mediaBox,
+                                        sk_sp<SkPDFDict> resourceDict,
+                                        const char* colorSpace);
 #endif