diff options
| -rw-r--r-- | include/pdf/SkPDFDevice.h | 6 | ||||
| -rw-r--r-- | include/pdf/SkPDFPage.h | 7 | ||||
| -rw-r--r-- | include/pdf/SkPDFTypes.h | 10 | ||||
| -rw-r--r-- | src/pdf/SkPDFDevice.cpp | 19 | ||||
| -rw-r--r-- | src/pdf/SkPDFFormXObject.cpp | 2 | ||||
| -rw-r--r-- | src/pdf/SkPDFPage.cpp | 2 | ||||
| -rw-r--r-- | src/pdf/SkPDFShader.cpp | 2 |
7 files changed, 31 insertions, 17 deletions
diff --git a/include/pdf/SkPDFDevice.h b/include/pdf/SkPDFDevice.h index 9d6b54cf8b..354729d7c5 100644 --- a/include/pdf/SkPDFDevice.h +++ b/include/pdf/SkPDFDevice.h @@ -124,8 +124,12 @@ public: /** Get the list of resources (PDF objects) used on this page. * @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(SkTDArray<SkPDFObject*>* resourceList) const; + SK_API void getResources(SkTDArray<SkPDFObject*>* resourceList, + bool recursive) const; /** Get the fonts used on this device. */ diff --git a/include/pdf/SkPDFPage.h b/include/pdf/SkPDFPage.h index 38a371ae00..e726638ebb 100644 --- a/include/pdf/SkPDFPage.h +++ b/include/pdf/SkPDFPage.h @@ -40,9 +40,10 @@ 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 resourceObjects The resource objects used on the page are added - * to this array. This gives the caller a chance - * to deduplicate resources across pages. + * @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. */ void finalizePage(SkPDFCatalog* catalog, bool firstPage, SkTDArray<SkPDFObject*>* resourceObjects); diff --git a/include/pdf/SkPDFTypes.h b/include/pdf/SkPDFTypes.h index 155b8262fa..6334938d77 100644 --- a/include/pdf/SkPDFTypes.h +++ b/include/pdf/SkPDFTypes.h @@ -40,11 +40,11 @@ public: */ virtual size_t getOutputSize(SkPDFCatalog* catalog, bool indirect); - /** If this object explicitly depends on other objects, add them to the - * end of the list. This only applies to higher level object, where - * the depenency is explicit and introduced by the class. i.e. an - * SkPDFImage added to an SkPDFDevice, but not an SkPDFObjRef added to - * an SkPDFArray. + /** For non-primitive objects (i.e. objects defined outside this file), + * 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(SkTDArray<SkPDFObject*>* resourceList); diff --git a/src/pdf/SkPDFDevice.cpp b/src/pdf/SkPDFDevice.cpp index ba889567bb..e7b24338d2 100644 --- a/src/pdf/SkPDFDevice.cpp +++ b/src/pdf/SkPDFDevice.cpp @@ -1037,7 +1037,8 @@ SkPDFDict* SkPDFDevice::getResourceDict() { return fResourceDict.get(); } -void SkPDFDevice::getResources(SkTDArray<SkPDFObject*>* resourceList) const { +void SkPDFDevice::getResources(SkTDArray<SkPDFObject*>* resourceList, + bool recursive) const { resourceList->setReserve(resourceList->count() + fGraphicStateResources.count() + fXObjectResources.count() + @@ -1046,22 +1047,30 @@ void SkPDFDevice::getResources(SkTDArray<SkPDFObject*>* resourceList) const { for (int i = 0; i < fGraphicStateResources.count(); i++) { resourceList->push(fGraphicStateResources[i]); fGraphicStateResources[i]->ref(); - fGraphicStateResources[i]->getResources(resourceList); + if (recursive) { + fGraphicStateResources[i]->getResources(resourceList); + } } for (int i = 0; i < fXObjectResources.count(); i++) { resourceList->push(fXObjectResources[i]); fXObjectResources[i]->ref(); - fXObjectResources[i]->getResources(resourceList); + if (recursive) { + fXObjectResources[i]->getResources(resourceList); + } } for (int i = 0; i < fFontResources.count(); i++) { resourceList->push(fFontResources[i]); fFontResources[i]->ref(); - fFontResources[i]->getResources(resourceList); + if (recursive) { + fFontResources[i]->getResources(resourceList); + } } for (int i = 0; i < fShaderResources.count(); i++) { resourceList->push(fShaderResources[i]); fShaderResources[i]->ref(); - fShaderResources[i]->getResources(resourceList); + if (recursive) { + fShaderResources[i]->getResources(resourceList); + } } } diff --git a/src/pdf/SkPDFFormXObject.cpp b/src/pdf/SkPDFFormXObject.cpp index 5ac93e4a83..fb8a9159cf 100644 --- a/src/pdf/SkPDFFormXObject.cpp +++ b/src/pdf/SkPDFFormXObject.cpp @@ -20,7 +20,7 @@ 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). - device->getResources(&fResources); + device->getResources(&fResources, false); SkRefPtr<SkStream> content = device->content(); content->unref(); // SkRefPtr and content() both took a reference. diff --git a/src/pdf/SkPDFPage.cpp b/src/pdf/SkPDFPage.cpp index 136ef449cf..3f3dec98b3 100644 --- a/src/pdf/SkPDFPage.cpp +++ b/src/pdf/SkPDFPage.cpp @@ -32,7 +32,7 @@ void SkPDFPage::finalizePage(SkPDFCatalog* catalog, bool firstPage, insert("Contents", new SkPDFObjRef(fContentStream.get()))->unref(); } catalog->addObject(fContentStream.get(), firstPage); - fDevice->getResources(resourceObjects); + fDevice->getResources(resourceObjects, true); } off_t SkPDFPage::getPageSize(SkPDFCatalog* catalog, off_t fileOffset) { diff --git a/src/pdf/SkPDFShader.cpp b/src/pdf/SkPDFShader.cpp index 72aeb7159d..15acf67c72 100644 --- a/src/pdf/SkPDFShader.cpp +++ b/src/pdf/SkPDFShader.cpp @@ -693,7 +693,7 @@ SkPDFImageShader::SkPDFImageShader(SkPDFShader::State* state) : fState(state) { // Put the canvas into the pattern stream (fContent). SkRefPtr<SkStream> content = pattern.content(); content->unref(); // SkRefPtr and content() both took a reference. - pattern.getResources(&fResources); + pattern.getResources(&fResources, false); setData(content.get()); insertName("Type", "Pattern"); |