diff options
author | halcanary <halcanary@google.com> | 2015-03-25 13:23:13 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-03-25 13:23:13 -0700 |
commit | d4714af018158c15e13439bef2c9b5bafc25c1d7 (patch) | |
tree | c3161b2001d9e2bdd2e378f3690c0bc3c1e20261 /src/pdf/SkPDFTypes.h | |
parent | b3e5e4d314301617d2d48b7589dfd426bd68a671 (diff) |
SkPDF SkPDFObject::addResources signature simplified
- SkPDFcatalog keeps a ordered list of object pointers
- Elimiante SkTSet template class
- SkPDFObject::addResources signature changes
BUG=skia:3585
Review URL: https://codereview.chromium.org/1038523004
Diffstat (limited to 'src/pdf/SkPDFTypes.h')
-rw-r--r-- | src/pdf/SkPDFTypes.h | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/src/pdf/SkPDFTypes.h b/src/pdf/SkPDFTypes.h index 7a72a38c78..3bc606509c 100644 --- a/src/pdf/SkPDFTypes.h +++ b/src/pdf/SkPDFTypes.h @@ -14,7 +14,6 @@ #include "SkScalar.h" #include "SkString.h" #include "SkTDArray.h" -#include "SkTSet.h" #include "SkTypes.h" class SkPDFCatalog; @@ -41,13 +40,11 @@ public: virtual void emitObject(SkWStream* stream, SkPDFCatalog* catalog) = 0; /** - * Adds all transitive dependencies of this object to resourceSet. - * - * @param catalog Implementations should respect the catalog's - * object substitution map. + * Adds all transitive dependencies of this object to the + * catalog. Implementations should respect the catalog's object + * substitution map. */ - virtual void addResources(SkTSet<SkPDFObject*>* resourceSet, - SkPDFCatalog* catalog) const {} + virtual void addResources(SkPDFCatalog* catalog) const {} private: typedef SkRefCnt INHERITED; @@ -69,7 +66,7 @@ public: // The SkPDFObject interface. virtual void emitObject(SkWStream* stream, SkPDFCatalog* catalog) SK_OVERRIDE; - virtual void addResources(SkTSet<SkPDFObject*>*, SkPDFCatalog*) const SK_OVERRIDE; + virtual void addResources(SkPDFCatalog*) const SK_OVERRIDE; private: SkAutoTUnref<SkPDFObject> fObj; @@ -233,7 +230,7 @@ public: // The SkPDFObject interface. virtual void emitObject(SkWStream* stream, SkPDFCatalog* catalog) SK_OVERRIDE; - virtual void addResources(SkTSet<SkPDFObject*>*, SkPDFCatalog*) const SK_OVERRIDE; + virtual void addResources(SkPDFCatalog*) const SK_OVERRIDE; /** The size of the array. */ @@ -305,7 +302,7 @@ public: // The SkPDFObject interface. virtual void emitObject(SkWStream* stream, SkPDFCatalog* catalog) SK_OVERRIDE; - virtual void addResources(SkTSet<SkPDFObject*>*, SkPDFCatalog*) const SK_OVERRIDE; + virtual void addResources(SkPDFCatalog*) const SK_OVERRIDE; /** The size of the dictionary. */ |