SkPDF: ResourceDict replaced by factory function

src/pdf/SkPDFResourceDict.h

Index: src/pdf/SkPDFResourceDict.h
diff --git a/src/pdf/SkPDFResourceDict.h b/src/pdf/SkPDFResourceDict.h
index 22173719fe08e56bd03045314c865bd251a6a7e1..291377903ff1deeb242f78384b2669afbbe41d9e 100644
--- a/src/pdf/SkPDFResourceDict.h
+++ b/src/pdf/SkPDFResourceDict.h
@@ -18,11 +18,9 @@
     allows generation of a list of referenced SkPDFObjects inserted with
     insertResourceAsRef.
 */
-class SkPDFResourceDict : public SkPDFDict {
+class SkPDFResourceDict {
 public:
-    SK_DECLARE_INST_COUNT(SkPDFResourceDict)
-
-     enum SkPDFResourceType{
+    enum SkPDFResourceType {
         kExtGState_ResourceType,
         kPattern_ResourceType,
         kXObject_ResourceType,
@@ -30,28 +28,19 @@ public:
         // These additional types are defined by the spec, but not
         // currently used by Skia: ColorSpace, Shading, Properties
         kResourceTypeCount
-     };
+    };
 
     /** Create a PDF resource dictionary.
      *  The full set of ProcSet entries is automatically created for backwards
      *  compatibility, as recommended by the PDF spec.
+     *
+     *  Any arguments can be NULL.
      */
-    SkPDFResourceDict();
-
-    /** Add the value SkPDFObject as a reference to the resource dictionary
-     *  with the give type and key.
-     *  The relevant sub-dicts will be automatically generated, and the
-     *  resource will be named by concatenating a type-specific prefix and
-     *  the input key.
-     *  This object will be part of the resource list when requested later.
-     *  @param type  The type of resource being entered, like
-     *    kPattern_ResourceType or kExtGState_ResourceType.
-     *  @param key   The resource key, should be unique within its type.
-     *  @param value The resource itself.
-     *  @return The value argument is returned.
-     */
-    SkPDFObject* insertResourceAsReference(SkPDFResourceType type, int key,
-                                           SkPDFObject* value);
+    static SkPDFDict* Create(
+        const SkTDArray<SkPDFObject*>* gStateResources,
+        const SkTDArray<SkPDFObject*>* patternResources,
+        const SkTDArray<SkPDFObject*>* xObjectResources,
+        const SkTDArray<SkPDFObject*>* fontResources);
 
     /**
      * Returns the name for the resource that will be generated by the resource
@@ -62,23 +51,6 @@ public:
      *  @param key   The resource key, should be unique within its type.
      */
     static SkString getResourceName(SkPDFResourceType type, int key);
-
-private:
-    /** Add the value to the dictionary with the given key.  Refs value.
-     *  The relevant sub-dicts will be automatically generated, and the
-     *  resource will be named by concatenating a type-specific prefix and
-     *  the input key.
-     *  The object will NOT be part of the resource list when requested later.
-     *  @param type  The type of resource being entered.
-     *  @param key   The resource key, should be unique within its type.
-     *  @param value The resource itself.
-     *  @return The value argument is returned.
-     */
-    SkPDFObject* insertResource(SkPDFResourceType type, int key,
-                                SkPDFObject* value);
-
-    SkTDArray<SkPDFDict*> fTypes;
-    typedef SkPDFDict INHERITED;
 };
 
 #endif