| Index: src/pdf/SkPDFPage.cpp
|
| diff --git a/src/pdf/SkPDFPage.cpp b/src/pdf/SkPDFPage.cpp
|
| index f59b5d572c515b6b068bdfa490a7dcd7d417e032..d940f41065b9d56467110919f1d938e94ec020e0 100644
|
| --- a/src/pdf/SkPDFPage.cpp
|
| +++ b/src/pdf/SkPDFPage.cpp
|
| @@ -10,7 +10,6 @@
|
| #include "SkPDFCatalog.h"
|
| #include "SkPDFDevice.h"
|
| #include "SkPDFPage.h"
|
| -#include "SkPDFResourceDict.h"
|
| #include "SkStream.h"
|
|
|
| SkPDFPage::SkPDFPage(SkPDFDevice* content)
|
| @@ -24,9 +23,8 @@ SkPDFPage::~SkPDFPage() {}
|
| void SkPDFPage::finalizePage(SkPDFCatalog* catalog, bool firstPage,
|
| const SkTSet<SkPDFObject*>& knownResourceObjects,
|
| SkTSet<SkPDFObject*>* newResourceObjects) {
|
| - SkPDFResourceDict* resourceDict = fDevice->getResourceDict();
|
| if (fContentStream.get() == NULL) {
|
| - insert("Resources", resourceDict);
|
| + insert("Resources", fDevice->getResourceDict());
|
| SkSafeUnref(this->insert("MediaBox", fDevice->copyMediaBox()));
|
| if (!SkToBool(catalog->getDocumentFlags() &
|
| SkPDFDocument::kNoLinks_Flags)) {
|
| @@ -41,7 +39,7 @@ void SkPDFPage::finalizePage(SkPDFCatalog* catalog, bool firstPage,
|
| insert("Contents", new SkPDFObjRef(fContentStream.get()))->unref();
|
| }
|
| catalog->addObject(fContentStream.get(), firstPage);
|
| - resourceDict->getResources(knownResourceObjects, newResourceObjects, true);
|
| + fDevice->getResources(knownResourceObjects, newResourceObjects, true);
|
| }
|
|
|
| off_t SkPDFPage::getPageSize(SkPDFCatalog* catalog, off_t fileOffset) {
|
|
|