aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/pdf/SkPDFCatalog.cpp30
-rw-r--r--src/pdf/SkPDFCatalog.h6
-rw-r--r--src/pdf/SkPDFDevice.cpp63
-rw-r--r--src/pdf/SkPDFDocument.cpp85
-rw-r--r--src/pdf/SkPDFFont.cpp5
-rw-r--r--src/pdf/SkPDFFont.h3
-rw-r--r--src/pdf/SkPDFFormXObject.cpp20
-rw-r--r--src/pdf/SkPDFFormXObject.h5
-rw-r--r--src/pdf/SkPDFGraphicState.cpp6
-rw-r--r--src/pdf/SkPDFGraphicState.h3
-rw-r--r--src/pdf/SkPDFImage.cpp5
-rw-r--r--src/pdf/SkPDFImage.h3
-rw-r--r--src/pdf/SkPDFPage.cpp5
-rw-r--r--src/pdf/SkPDFPage.h6
-rw-r--r--src/pdf/SkPDFShader.cpp18
-rw-r--r--src/pdf/SkPDFTypes.cpp22
-rw-r--r--src/pdf/SkPDFTypes.h30
17 files changed, 123 insertions, 192 deletions
diff --git a/src/pdf/SkPDFCatalog.cpp b/src/pdf/SkPDFCatalog.cpp
index 6e84455307..c0f6fb03b9 100644
--- a/src/pdf/SkPDFCatalog.cpp
+++ b/src/pdf/SkPDFCatalog.cpp
@@ -168,16 +168,12 @@ void SkPDFCatalog::setSubstitute(SkPDFObject* original,
fSubstituteMap.append(1, &newMapping);
// Add resource objects of substitute object to catalog.
- SkTSet<SkPDFObject*>* targetSet = getSubstituteList(onFirstPage);
- SkTSet<SkPDFObject*> newResourceObjects;
- newMapping.fSubstitute->getResources(*targetSet, &newResourceObjects);
- for (int i = 0; i < newResourceObjects.count(); ++i) {
- addObject(newResourceObjects[i], onFirstPage);
- }
- // mergeInto returns the number of duplicates.
- // If there are duplicates, there is a bug and we mess ref counting.
- SkDEBUGCODE(int duplicates =) targetSet->mergeInto(newResourceObjects);
- SkASSERT(duplicates == 0);
+ SkTDArray<SkPDFObject*>* targetList = getSubstituteList(onFirstPage);
+ int existingSize = targetList->count();
+ newMapping.fSubstitute->getResources(targetList);
+ for (int i = existingSize; i < targetList->count(); ++i) {
+ addObject((*targetList)[i], onFirstPage);
+ }
}
SkPDFObject* SkPDFCatalog::getSubstituteObject(SkPDFObject* object) {
@@ -191,22 +187,22 @@ SkPDFObject* SkPDFCatalog::getSubstituteObject(SkPDFObject* object) {
off_t SkPDFCatalog::setSubstituteResourcesOffsets(off_t fileOffset,
bool firstPage) {
- SkTSet<SkPDFObject*>* targetSet = getSubstituteList(firstPage);
+ SkTDArray<SkPDFObject*>* targetList = getSubstituteList(firstPage);
off_t offsetSum = fileOffset;
- for (int i = 0; i < targetSet->count(); ++i) {
- offsetSum += setFileOffset((*targetSet)[i], offsetSum);
+ for (int i = 0; i < targetList->count(); ++i) {
+ offsetSum += setFileOffset((*targetList)[i], offsetSum);
}
return offsetSum - fileOffset;
}
void SkPDFCatalog::emitSubstituteResources(SkWStream *stream, bool firstPage) {
- SkTSet<SkPDFObject*>* targetSet = getSubstituteList(firstPage);
- for (int i = 0; i < targetSet->count(); ++i) {
- (*targetSet)[i]->emit(stream, this, true);
+ SkTDArray<SkPDFObject*>* targetList = getSubstituteList(firstPage);
+ for (int i = 0; i < targetList->count(); ++i) {
+ (*targetList)[i]->emit(stream, this, true);
}
}
-SkTSet<SkPDFObject*>* SkPDFCatalog::getSubstituteList(bool firstPage) {
+SkTDArray<SkPDFObject*>* SkPDFCatalog::getSubstituteList(bool firstPage) {
return firstPage ? &fSubstituteResourcesFirstPage :
&fSubstituteResourcesRemaining;
}
diff --git a/src/pdf/SkPDFCatalog.h b/src/pdf/SkPDFCatalog.h
index c7c6d6e299..d5825ace5a 100644
--- a/src/pdf/SkPDFCatalog.h
+++ b/src/pdf/SkPDFCatalog.h
@@ -115,8 +115,8 @@ private:
// TODO(arthurhsu): Make this a hash if it's a performance problem.
SkTDArray<SubstituteMapping> fSubstituteMap;
- SkTSet<SkPDFObject*> fSubstituteResourcesFirstPage;
- SkTSet<SkPDFObject*> fSubstituteResourcesRemaining;
+ SkTDArray<SkPDFObject*> fSubstituteResourcesFirstPage;
+ SkTDArray<SkPDFObject*> fSubstituteResourcesRemaining;
// Number of objects on the first page.
uint32_t fFirstPageCount;
@@ -131,7 +131,7 @@ private:
int assignObjNum(SkPDFObject* obj);
- SkTSet<SkPDFObject*>* getSubstituteList(bool firstPage);
+ SkTDArray<SkPDFObject*>* getSubstituteList(bool firstPage);
};
#endif
diff --git a/src/pdf/SkPDFDevice.cpp b/src/pdf/SkPDFDevice.cpp
index 7fb6db0e61..aabc6b3bcc 100644
--- a/src/pdf/SkPDFDevice.cpp
+++ b/src/pdf/SkPDFDevice.cpp
@@ -32,7 +32,6 @@
#include "SkTemplates.h"
#include "SkTypeface.h"
#include "SkTypes.h"
-#include "SkTSet.h"
// Utility functions
@@ -1176,57 +1175,39 @@ SkPDFDict* SkPDFDevice::getResourceDict() {
return fResourceDict;
}
-void SkPDFDevice::getResources(const SkTSet<SkPDFObject*>& knownResourceObjects,
- SkTSet<SkPDFObject*>* newResourceObjects,
+void SkPDFDevice::getResources(SkTDArray<SkPDFObject*>* resourceList,
bool recursive) const {
- // TODO: reserve not correct if we need to recursively explore.
- newResourceObjects->setReserve(newResourceObjects->count() +
- fGraphicStateResources.count() +
- fXObjectResources.count() +
- fFontResources.count() +
- fShaderResources.count());
+ resourceList->setReserve(resourceList->count() +
+ fGraphicStateResources.count() +
+ fXObjectResources.count() +
+ fFontResources.count() +
+ fShaderResources.count());
for (int i = 0; i < fGraphicStateResources.count(); i++) {
- if (!knownResourceObjects.contains(fGraphicStateResources[i]) &&
- !newResourceObjects->contains(fGraphicStateResources[i])) {
- newResourceObjects->add(fGraphicStateResources[i]);
- fGraphicStateResources[i]->ref();
- if (recursive) {
- fGraphicStateResources[i]->getResources(knownResourceObjects,
- newResourceObjects);
- }
+ resourceList->push(fGraphicStateResources[i]);
+ fGraphicStateResources[i]->ref();
+ if (recursive) {
+ fGraphicStateResources[i]->getResources(resourceList);
}
}
for (int i = 0; i < fXObjectResources.count(); i++) {
- if (!knownResourceObjects.contains(fXObjectResources[i]) &&
- !newResourceObjects->contains(fXObjectResources[i])) {
- newResourceObjects->add(fXObjectResources[i]);
- fXObjectResources[i]->ref();
- if (recursive) {
- fXObjectResources[i]->getResources(knownResourceObjects,
- newResourceObjects);
- }
+ resourceList->push(fXObjectResources[i]);
+ fXObjectResources[i]->ref();
+ if (recursive) {
+ fXObjectResources[i]->getResources(resourceList);
}
}
for (int i = 0; i < fFontResources.count(); i++) {
- if (!knownResourceObjects.contains(fFontResources[i]) &&
- !newResourceObjects->contains(fFontResources[i])) {
- newResourceObjects->add(fFontResources[i]);
- fFontResources[i]->ref();
- if (recursive) {
- fFontResources[i]->getResources(knownResourceObjects,
- newResourceObjects);
- }
+ resourceList->push(fFontResources[i]);
+ fFontResources[i]->ref();
+ if (recursive) {
+ fFontResources[i]->getResources(resourceList);
}
}
for (int i = 0; i < fShaderResources.count(); i++) {
- if (!knownResourceObjects.contains(fShaderResources[i]) &&
- !newResourceObjects->contains(fShaderResources[i])) {
- newResourceObjects->add(fShaderResources[i]);
- fShaderResources[i]->ref();
- if (recursive) {
- fShaderResources[i]->getResources(knownResourceObjects,
- newResourceObjects);
- }
+ resourceList->push(fShaderResources[i]);
+ fShaderResources[i]->ref();
+ if (recursive) {
+ fShaderResources[i]->getResources(resourceList);
}
}
}
diff --git a/src/pdf/SkPDFDocument.cpp b/src/pdf/SkPDFDocument.cpp
index fc0928616d..c7266d8454 100644
--- a/src/pdf/SkPDFDocument.cpp
+++ b/src/pdf/SkPDFDocument.cpp
@@ -14,13 +14,21 @@
#include "SkPDFPage.h"
#include "SkPDFTypes.h"
#include "SkStream.h"
-#include "SkTSet.h"
-static void addResourcesToCatalog(bool firstPage,
- SkTSet<SkPDFObject*>* resourceSet,
- SkPDFCatalog* catalog) {
- for (int i = 0; i < resourceSet->count(); i++) {
- catalog->addObject((*resourceSet)[i], firstPage);
+// Add the resources, starting at firstIndex to the catalog, removing any dupes.
+// A hash table would be really nice here.
+static void addResourcesToCatalog(int firstIndex, bool firstPage,
+ SkTDArray<SkPDFObject*>* resourceList,
+ SkPDFCatalog* catalog) {
+ for (int i = firstIndex; i < resourceList->count(); i++) {
+ int index = resourceList->find((*resourceList)[i]);
+ if (index != i) {
+ (*resourceList)[i]->unref();
+ resourceList->removeShuffle(i);
+ i--;
+ } else {
+ catalog->addObject((*resourceList)[i], firstPage);
+ }
}
}
@@ -49,12 +57,11 @@ static void perform_font_subsetting(SkPDFCatalog* catalog,
SkPDFDocument::SkPDFDocument(Flags flags)
: fXRefFileOffset(0),
+ fSecondPageFirstResourceIndex(0),
fTrailerDict(NULL) {
fCatalog.reset(new SkPDFCatalog(flags));
fDocCatalog = SkNEW_ARGS(SkPDFDict, ("Catalog"));
fCatalog->addObject(fDocCatalog, true);
- fFirstPageResources = NULL;
- fOtherPageResources = NULL;
}
SkPDFDocument::~SkPDFDocument() {
@@ -66,14 +73,11 @@ SkPDFDocument::~SkPDFDocument() {
fPageTree[i]->clear();
}
fPageTree.safeUnrefAll();
- fFirstPageResources->safeUnrefAll();
- fOtherPageResources->safeUnrefAll();
+ fPageResources.safeUnrefAll();
fSubstitutes.safeUnrefAll();
fDocCatalog->unref();
SkSafeUnref(fTrailerDict);
- SkDELETE(fFirstPageResources);
- SkDELETE(fOtherPageResources);
}
bool SkPDFDocument::emitPDF(SkWStream* stream) {
@@ -86,9 +90,6 @@ bool SkPDFDocument::emitPDF(SkWStream* stream) {
}
}
- fFirstPageResources = SkNEW(SkTSet<SkPDFObject*>);
- fOtherPageResources = SkNEW(SkTSet<SkPDFObject*>);
-
// We haven't emitted the document before if fPageTree is empty.
if (fPageTree.isEmpty()) {
SkPDFDict* pageTreeRoot;
@@ -107,35 +108,15 @@ bool SkPDFDocument::emitPDF(SkWStream* stream) {
*/
bool firstPage = true;
- /* The references returned in newResources are transfered to
- * fFirstPageResources or fOtherPageResources depending on firstPage and
- * knownResources doesn't have a reference but just relies on the other
- * two sets to maintain a reference.
- */
- SkTSet<SkPDFObject*> knownResources;
-
- // mergeInto returns the number of duplicates.
- // If there are duplicates, there is a bug and we mess ref counting.
- int duplicates = 0;
- knownResources.mergeInto(*fFirstPageResources);
for (int i = 0; i < fPages.count(); i++) {
- if (i == 1) {
+ int resourceCount = fPageResources.count();
+ fPages[i]->finalizePage(fCatalog.get(), firstPage, &fPageResources);
+ addResourcesToCatalog(resourceCount, firstPage, &fPageResources,
+ fCatalog.get());
+ if (i == 0) {
firstPage = false;
- duplicates = knownResources.mergeInto(*fOtherPageResources);
- }
- SkTSet<SkPDFObject*> newResources;
- fPages[i]->finalizePage(
- fCatalog.get(), firstPage, knownResources, &newResources);
- addResourcesToCatalog(firstPage, &newResources, fCatalog.get());
- if (firstPage) {
- duplicates = fFirstPageResources->mergeInto(newResources);
- } else {
- duplicates = fOtherPageResources->mergeInto(newResources);
+ fSecondPageFirstResourceIndex = fPageResources.count();
}
- SkASSERT(duplicates == 0);
-
- duplicates = knownResources.mergeInto(newResources);
- SkASSERT(duplicates == 0);
}
// Build font subsetting info before proceeding.
@@ -147,8 +128,8 @@ bool SkPDFDocument::emitPDF(SkWStream* stream) {
fileOffset += fCatalog->setFileOffset(fPages[0], fileOffset);
fileOffset += fPages[0]->getPageSize(fCatalog.get(),
(size_t) fileOffset);
- for (int i = 0; i < fFirstPageResources->count(); i++) {
- fileOffset += fCatalog->setFileOffset((*fFirstPageResources)[i],
+ for (int i = 0; i < fSecondPageFirstResourceIndex; i++) {
+ fileOffset += fCatalog->setFileOffset(fPageResources[i],
fileOffset);
}
// Add the size of resources of substitute objects used on page 1.
@@ -166,9 +147,11 @@ bool SkPDFDocument::emitPDF(SkWStream* stream) {
fileOffset += fPages[i]->getPageSize(fCatalog.get(), fileOffset);
}
- for (int i = 0; i < fOtherPageResources->count(); i++) {
- fileOffset += fCatalog->setFileOffset(
- (*fOtherPageResources)[i], fileOffset);
+ for (int i = fSecondPageFirstResourceIndex;
+ i < fPageResources.count();
+ i++) {
+ fileOffset += fCatalog->setFileOffset(fPageResources[i],
+ fileOffset);
}
fileOffset += fCatalog->setSubstituteResourcesOffsets(fileOffset,
@@ -180,8 +163,8 @@ bool SkPDFDocument::emitPDF(SkWStream* stream) {
fDocCatalog->emitObject(stream, fCatalog.get(), true);
fPages[0]->emitObject(stream, fCatalog.get(), true);
fPages[0]->emitPage(stream, fCatalog.get());
- for (int i = 0; i < fFirstPageResources->count(); i++) {
- (*fFirstPageResources)[i]->emit(stream, fCatalog.get(), true);
+ for (int i = 0; i < fSecondPageFirstResourceIndex; i++) {
+ fPageResources[i]->emit(stream, fCatalog.get(), true);
}
fCatalog->emitSubstituteResources(stream, true);
// TODO(vandebo): Support linearized format
@@ -198,8 +181,10 @@ bool SkPDFDocument::emitPDF(SkWStream* stream) {
fPages[i]->emitPage(stream, fCatalog.get());
}
- for (int i = 0; i < fOtherPageResources->count(); i++) {
- (*fOtherPageResources)[i]->emit(stream, fCatalog.get(), true);
+ for (int i = fSecondPageFirstResourceIndex;
+ i < fPageResources.count();
+ i++) {
+ fPageResources[i]->emit(stream, fCatalog.get(), true);
}
fCatalog->emitSubstituteResources(stream, false);
diff --git a/src/pdf/SkPDFFont.cpp b/src/pdf/SkPDFFont.cpp
index af58ac76a3..89b4fc9ac7 100644
--- a/src/pdf/SkPDFFont.cpp
+++ b/src/pdf/SkPDFFont.cpp
@@ -716,9 +716,8 @@ SkPDFFont::~SkPDFFont() {
fResources.unrefAll();
}
-void SkPDFFont::getResources(const SkTSet<SkPDFObject*>& knownResourceObjects,
- SkTSet<SkPDFObject*>* newResourceObjects) {
- GetResourcesHelper(&fResources, knownResourceObjects, newResourceObjects);
+void SkPDFFont::getResources(SkTDArray<SkPDFObject*>* resourceList) {
+ GetResourcesHelper(&fResources, resourceList);
}
SkTypeface* SkPDFFont::typeface() {
diff --git a/src/pdf/SkPDFFont.h b/src/pdf/SkPDFFont.h
index d3aae89179..693b911061 100644
--- a/src/pdf/SkPDFFont.h
+++ b/src/pdf/SkPDFFont.h
@@ -81,8 +81,7 @@ class SkPDFFont : public SkPDFDict {
public:
virtual ~SkPDFFont();
- virtual void getResources(const SkTSet<SkPDFObject*>& knownResourceObjects,
- SkTSet<SkPDFObject*>* newResourceObjects);
+ virtual void getResources(SkTDArray<SkPDFObject*>* resourceList);
/** Returns the typeface represented by this class. Returns NULL for the
* default typeface.
diff --git a/src/pdf/SkPDFFormXObject.cpp b/src/pdf/SkPDFFormXObject.cpp
index 884e6db2e4..5e33995b74 100644
--- a/src/pdf/SkPDFFormXObject.cpp
+++ b/src/pdf/SkPDFFormXObject.cpp
@@ -20,8 +20,16 @@ SkPDFFormXObject::SkPDFFormXObject(SkPDFDevice* device) {
// We don't want to keep around device because we'd have two copies
// of content, so reference or copy everything we need (content and
// resources).
- SkTSet<SkPDFObject*> emptySet;
- device->getResources(emptySet, &fResources, false);
+ device->getResources(&fResources, false);
+
+ // Fail fast if in the tree of resources a child references a parent.
+ // If there is an issue, getResources will end up consuming all memory.
+ // TODO: A better approach might be for all SkPDFObject to keep track
+ // of possible cycles.
+#ifdef SK_DEBUG
+ SkTDArray<SkPDFObject*> dummy_resourceList;
+ getResources(&dummy_resourceList);
+#endif
SkAutoTUnref<SkStream> content(device->content());
setData(content.get());
@@ -56,10 +64,6 @@ SkPDFFormXObject::~SkPDFFormXObject() {
fResources.unrefAll();
}
-void SkPDFFormXObject::getResources(
- const SkTSet<SkPDFObject*>& knownResourceObjects,
- SkTSet<SkPDFObject*>* newResourceObjects) {
- GetResourcesHelper(&fResources.toArray(),
- knownResourceObjects,
- newResourceObjects);
+void SkPDFFormXObject::getResources(SkTDArray<SkPDFObject*>* resourceList) {
+ GetResourcesHelper(&fResources, resourceList);
}
diff --git a/src/pdf/SkPDFFormXObject.h b/src/pdf/SkPDFFormXObject.h
index b1a6f7425d..0c49152a1b 100644
--- a/src/pdf/SkPDFFormXObject.h
+++ b/src/pdf/SkPDFFormXObject.h
@@ -39,11 +39,10 @@ public:
virtual ~SkPDFFormXObject();
// The SkPDFObject interface.
- virtual void getResources(const SkTSet<SkPDFObject*>& knownResourceObjects,
- SkTSet<SkPDFObject*>* newResourceObjects);
+ virtual void getResources(SkTDArray<SkPDFObject*>* resourceList);
private:
- SkTSet<SkPDFObject*> fResources;
+ SkTDArray<SkPDFObject*> fResources;
};
#endif
diff --git a/src/pdf/SkPDFGraphicState.cpp b/src/pdf/SkPDFGraphicState.cpp
index 61929b34f1..558deb7fdf 100644
--- a/src/pdf/SkPDFGraphicState.cpp
+++ b/src/pdf/SkPDFGraphicState.cpp
@@ -59,10 +59,8 @@ SkPDFGraphicState::~SkPDFGraphicState() {
fResources.unrefAll();
}
-void SkPDFGraphicState::getResources(
- const SkTSet<SkPDFObject*>& knownResourceObjects,
- SkTSet<SkPDFObject*>* newResourceObjects) {
- GetResourcesHelper(&fResources, knownResourceObjects, newResourceObjects);
+void SkPDFGraphicState::getResources(SkTDArray<SkPDFObject*>* resourceList) {
+ GetResourcesHelper(&fResources, resourceList);
}
void SkPDFGraphicState::emitObject(SkWStream* stream, SkPDFCatalog* catalog,
diff --git a/src/pdf/SkPDFGraphicState.h b/src/pdf/SkPDFGraphicState.h
index 64f34f8744..af01737276 100644
--- a/src/pdf/SkPDFGraphicState.h
+++ b/src/pdf/SkPDFGraphicState.h
@@ -30,8 +30,7 @@ class SkPDFGraphicState : public SkPDFDict {
public:
virtual ~SkPDFGraphicState();
- virtual void getResources(const SkTSet<SkPDFObject*>& knownResourceObjects,
- SkTSet<SkPDFObject*>* newResourceObjects);
+ virtual void getResources(SkTDArray<SkPDFObject*>* resourceList);
// Override emitObject and getOutputSize so that we can populate
// the dictionary on demand.
diff --git a/src/pdf/SkPDFImage.cpp b/src/pdf/SkPDFImage.cpp
index 9c57fba029..1b93f6e045 100644
--- a/src/pdf/SkPDFImage.cpp
+++ b/src/pdf/SkPDFImage.cpp
@@ -287,9 +287,8 @@ SkPDFImage* SkPDFImage::addSMask(SkPDFImage* mask) {
return mask;
}
-void SkPDFImage::getResources(const SkTSet<SkPDFObject*>& knownResourceObjects,
- SkTSet<SkPDFObject*>* newResourceObjects) {
- GetResourcesHelper(&fResources, knownResourceObjects, newResourceObjects);
+void SkPDFImage::getResources(SkTDArray<SkPDFObject*>* resourceList) {
+ GetResourcesHelper(&fResources, resourceList);
}
SkPDFImage::SkPDFImage(SkStream* imageData, const SkBitmap& bitmap,
diff --git a/src/pdf/SkPDFImage.h b/src/pdf/SkPDFImage.h
index 69aa7da72a..48b0157da9 100644
--- a/src/pdf/SkPDFImage.h
+++ b/src/pdf/SkPDFImage.h
@@ -49,8 +49,7 @@ public:
SkPDFImage* addSMask(SkPDFImage* mask);
// The SkPDFObject interface.
- virtual void getResources(const SkTSet<SkPDFObject*>& knownResourceObjects,
- SkTSet<SkPDFObject*>* newResourceObjects);
+ virtual void getResources(SkTDArray<SkPDFObject*>* resourceList);
private:
SkTDArray<SkPDFObject*> fResources;
diff --git a/src/pdf/SkPDFPage.cpp b/src/pdf/SkPDFPage.cpp
index cad109948f..f47f8ffd46 100644
--- a/src/pdf/SkPDFPage.cpp
+++ b/src/pdf/SkPDFPage.cpp
@@ -21,8 +21,7 @@ SkPDFPage::SkPDFPage(SkPDFDevice* content)
SkPDFPage::~SkPDFPage() {}
void SkPDFPage::finalizePage(SkPDFCatalog* catalog, bool firstPage,
- const SkTSet<SkPDFObject*>& knownResourceObjects,
- SkTSet<SkPDFObject*>* newResourceObjects) {
+ SkTDArray<SkPDFObject*>* resourceObjects) {
if (fContentStream.get() == NULL) {
insert("Resources", fDevice->getResourceDict());
SkSafeUnref(this->insert("MediaBox", fDevice->copyMediaBox()));
@@ -39,7 +38,7 @@ void SkPDFPage::finalizePage(SkPDFCatalog* catalog, bool firstPage,
insert("Contents", new SkPDFObjRef(fContentStream.get()))->unref();
}
catalog->addObject(fContentStream.get(), firstPage);
- fDevice->getResources(knownResourceObjects, newResourceObjects, true);
+ fDevice->getResources(resourceObjects, true);
}
off_t SkPDFPage::getPageSize(SkPDFCatalog* catalog, off_t fileOffset) {
diff --git a/src/pdf/SkPDFPage.h b/src/pdf/SkPDFPage.h
index 17fd437623..72ba335e66 100644
--- a/src/pdf/SkPDFPage.h
+++ b/src/pdf/SkPDFPage.h
@@ -40,15 +40,13 @@ public:
* that the page is part of.
* @param catalog The catalog to add page content objects to.
* @param firstPage Indicate if this is the first page of a document.
- * @param newResourceObjects All the resource objects (recursively) used on
+ * @param resourceObjects All the resource objects (recursively) used on
* the page are added to this array. This gives
* the caller a chance to deduplicate resources
* across pages.
- * @param knownResourceObjects The set of resources to be ignored.
*/
void finalizePage(SkPDFCatalog* catalog, bool firstPage,
- const SkTSet<SkPDFObject*>& knownResourceObjects,
- SkTSet<SkPDFObject*>* newResourceObjects);
+ SkTDArray<SkPDFObject*>* resourceObjects);
/** Determine the size of the page content and store to the catalog
* the offsets of all nonresource-indirect objects that make up the page
diff --git a/src/pdf/SkPDFShader.cpp b/src/pdf/SkPDFShader.cpp
index b3e57cb951..7958de38ce 100644
--- a/src/pdf/SkPDFShader.cpp
+++ b/src/pdf/SkPDFShader.cpp
@@ -425,11 +425,8 @@ public:
virtual bool isValid() { return fResources.count() > 0; }
- void getResources(const SkTSet<SkPDFObject*>& knownResourceObjects,
- SkTSet<SkPDFObject*>* newResourceObjects) {
- GetResourcesHelper(&fResources,
- knownResourceObjects,
- newResourceObjects);
+ void getResources(SkTDArray<SkPDFObject*>* resourceList) {
+ GetResourcesHelper(&fResources, resourceList);
}
private:
@@ -451,15 +448,12 @@ public:
virtual bool isValid() { return size() > 0; }
- void getResources(const SkTSet<SkPDFObject*>& knownResourceObjects,
- SkTSet<SkPDFObject*>* newResourceObjects) {
- GetResourcesHelper(&fResources.toArray(),
- knownResourceObjects,
- newResourceObjects);
+ void getResources(SkTDArray<SkPDFObject*>* resourceList) {
+ GetResourcesHelper(&fResources, resourceList);
}
private:
- SkTSet<SkPDFObject*> fResources;
+ SkTDArray<SkPDFObject*> fResources;
SkAutoTDelete<const SkPDFShader::State> fState;
};
@@ -838,7 +832,7 @@ SkPDFImageShader::SkPDFImageShader(SkPDFShader::State* state) : fState(state) {
// Put the canvas into the pattern stream (fContent).
SkAutoTUnref<SkStream> content(pattern.content());
setData(content.get());
- pattern.getResources(fResources, &fResources, false);
+ pattern.getResources(&fResources, false);
insertName("Type", "Pattern");
insertInt("PatternType", 1);
diff --git a/src/pdf/SkPDFTypes.cpp b/src/pdf/SkPDFTypes.cpp
index 6c7120b0d7..59250c8534 100644
--- a/src/pdf/SkPDFTypes.cpp
+++ b/src/pdf/SkPDFTypes.cpp
@@ -41,8 +41,7 @@ size_t SkPDFObject::getOutputSize(SkPDFCatalog* catalog, bool indirect) {
return buffer.getOffset();
}
-void SkPDFObject::getResources(const SkTSet<SkPDFObject*>& knownResourceObjects,
- SkTSet<SkPDFObject*>* newResourceObjects) {}
+void SkPDFObject::getResources(SkTDArray<SkPDFObject*>* resourceList) {}
void SkPDFObject::emitIndirectObject(SkWStream* stream, SkPDFCatalog* catalog) {
catalog->emitObjectNumber(stream, this);
@@ -62,21 +61,14 @@ void SkPDFObject::AddResourceHelper(SkPDFObject* resource,
resource->ref();
}
-void SkPDFObject::GetResourcesHelper(
- const SkTDArray<SkPDFObject*>* resources,
- const SkTSet<SkPDFObject*>& knownResourceObjects,
- SkTSet<SkPDFObject*>* newResourceObjects) {
+void SkPDFObject::GetResourcesHelper(SkTDArray<SkPDFObject*>* resources,
+ SkTDArray<SkPDFObject*>* result) {
if (resources->count()) {
- newResourceObjects->setReserve(
- newResourceObjects->count() + resources->count());
+ result->setReserve(result->count() + resources->count());
for (int i = 0; i < resources->count(); i++) {
- if (!knownResourceObjects.contains((*resources)[i]) &&
- !newResourceObjects->contains((*resources)[i])) {
- newResourceObjects->add((*resources)[i]);
- (*resources)[i]->ref();
- (*resources)[i]->getResources(knownResourceObjects,
- newResourceObjects);
- }
+ result->push((*resources)[i]);
+ (*resources)[i]->ref();
+ (*resources)[i]->getResources(result);
}
}
}
diff --git a/src/pdf/SkPDFTypes.h b/src/pdf/SkPDFTypes.h
index 49fbbde072..03799d0845 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;
@@ -39,16 +38,13 @@ public:
virtual size_t getOutputSize(SkPDFCatalog* catalog, bool indirect);
/** For non-primitive objects (i.e. objects defined outside this file),
- * this method will add to newResourceObjects any objects that this method
- * depends on, but not already in knownResourceObjects. This operates
- * 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.
+ * this method will add to resourceList any objects that this method
+ * depends on. This operates recursively so if this object depends on
+ * another object and that object depends on two more, all three objects
+ * will be added.
+ * @param resourceList The list to append dependant resources to.
*/
- virtual void getResources(const SkTSet<SkPDFObject*>& knownResourceObjects,
- SkTSet<SkPDFObject*>* newResourceObjects);
+ virtual void getResources(SkTDArray<SkPDFObject*>* resourceList);
/** Emit this object unless the catalog has a substitute object, in which
* case emit that.
@@ -78,16 +74,10 @@ public:
/** Static helper function to copy and reference the resources (and all
* their subresources) into a new list.
* @param resources The resource list.
- * @param newResourceObjects All the resource objects (recursively) used on
- * the page are added to this array. This gives
- * the caller a chance to deduplicate resources
- * across pages.
- * @param knownResourceObjects The set of resources to be ignored.
- */
- static void GetResourcesHelper(
- const SkTDArray<SkPDFObject*>* resources,
- const SkTSet<SkPDFObject*>& knownResourceObjects,
- SkTSet<SkPDFObject*>* newResourceObjects);
+ * @param result The list to add to.
+ */
+ static void GetResourcesHelper(SkTDArray<SkPDFObject*>* resources,
+ SkTDArray<SkPDFObject*>* result);
protected:
/** Subclasses must implement this method to print the object to the
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-08 23:44:14 +0000