revert r7892
git-svn-id: http://skia.googlecode.com/svn/trunk/include@7896 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/pdf/SkPDFDevice.h b/pdf/SkPDFDevice.h
index f42ecb8..a13d617 100644
--- a/pdf/SkPDFDevice.h
+++ b/pdf/SkPDFDevice.h
@@ -29,7 +29,6 @@
class SkPDFObject;
class SkPDFShader;
class SkPDFStream;
-template <typename T> class SK_API SkTSet;
// Private classes.
struct ContentEntry;
@@ -131,19 +130,12 @@
SK_API SkPDFDict* getResourceDict();
/** Get the list of resources (PDF objects) used on this page.
- * This method will add to newResourceObjects any objects that this method
- * depends on, but not already in knownResourceObjects. This might operate
- * recursively so if this object depends on another object and that object
- * depends on two more, all three objects will be added.
- *
- * @param knownResourceObjects The set of resources to be ignored.
- * @param newResourceObjects The set to append dependant resources to.
+ * @param resourceList A list to append the resources to.
* @param recursive If recursive is true, get the resources of the
* device's resources recursively. (Useful for adding
* objects to the catalog.)
*/
- SK_API void getResources(const SkTSet<SkPDFObject*>& knownResourceObjects,
- SkTSet<SkPDFObject*>* newResourceObjects,
+ SK_API void getResources(SkTDArray<SkPDFObject*>* resourceList,
bool recursive) const;
/** Get the fonts used on this device.
diff --git a/pdf/SkPDFDocument.h b/pdf/SkPDFDocument.h
index 443e8c2..167634e 100644
--- a/pdf/SkPDFDocument.h
+++ b/pdf/SkPDFDocument.h
@@ -21,7 +21,6 @@
class SkPDFPage;
class SkPDFObject;
class SkWStream;
-template <typename T> class SK_API SkTSet;
/** \class SkPDFDocument
@@ -77,8 +76,7 @@
SkTDArray<SkPDFPage*> fPages;
SkTDArray<SkPDFDict*> fPageTree;
SkPDFDict* fDocCatalog;
- SkTSet<SkPDFObject*>* fFirstPageResources;
- SkTSet<SkPDFObject*>* fOtherPageResources;
+ SkTDArray<SkPDFObject*> fPageResources;
SkTDArray<SkPDFObject*> fSubstitutes;
int fSecondPageFirstResourceIndex;
