diff options
| author |  edisonn@google.com <edisonn@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-04-02 15:33:08 +0000 |
|---|---|---|
| committer | edisonn@google.com <edisonn@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-04-02 15:33:08 +0000 |
| commit | 6addb1930013ebb2f984045141650fd7afcfa90f (patch) | |
| tree | dd4c38a7cb519486ecf9cf54c2f7a65ec85dcfca /src/pdf/SkPDFGraphicState.cpp | |
| parent | c52570475f00d5b62b8d82ba50b4b911dc38ce43 (diff) | |
resubmit https://code.google.com/p/skia/source/detail?r=7883 (in the meantime we
added capability to collect minidump and callstack if buildbot fails with heap
coruption in windows, and a NPE bug was fixed in SkPDFDocument, when document was destroyed without ever beeing used and a field was NULL + a few minor conflicts have been resolved)
git-svn-id: http://skia.googlecode.com/svn/trunk@8487 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/pdf/SkPDFGraphicState.cpp')
| -rw-r--r-- | src/pdf/SkPDFGraphicState.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/pdf/SkPDFGraphicState.cpp b/src/pdf/SkPDFGraphicState.cpp index 6ea535fd9b..9cf2145823 100644 --- a/src/pdf/SkPDFGraphicState.cpp +++ b/src/pdf/SkPDFGraphicState.cpp @@ -64,8 +64,10 @@ SkPDFGraphicState::~SkPDFGraphicState() { fResources.unrefAll(); } -void SkPDFGraphicState::getResources(SkTDArray<SkPDFObject*>* resourceList) { - GetResourcesHelper(&fResources, resourceList); +void SkPDFGraphicState::getResources( + const SkTSet<SkPDFObject*>& knownResourceObjects, + SkTSet<SkPDFObject*>* newResourceObjects) { + GetResourcesHelper(&fResources, knownResourceObjects, newResourceObjects); } void SkPDFGraphicState::emitObject(SkWStream* stream, SkPDFCatalog* catalog, |