diff options
| author |  edisonn@google.com <edisonn@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-03-19 17:19:05 +0000 |
|---|---|---|
| committer | edisonn@google.com <edisonn@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-03-19 17:19:05 +0000 |
| commit | 66bedbb02dbd252f46c1fad862d0561a0bb3f94b (patch) | |
| tree | 79627a69234e8df7883dfbc9243c7120aba2952e /src/pdf/SkPDFImage.cpp | |
| parent | f315451f78760e6e2066c09da3644ce93e0580e6 (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. a few minor conflicts have been resolved)
Review URL: https://codereview.chromium.org/12840004
git-svn-id: http://skia.googlecode.com/svn/trunk@8233 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/pdf/SkPDFImage.cpp')
| -rw-r--r-- | src/pdf/SkPDFImage.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/pdf/SkPDFImage.cpp b/src/pdf/SkPDFImage.cpp index 3533a2c3c0..f7889f16d7 100644 --- a/src/pdf/SkPDFImage.cpp +++ b/src/pdf/SkPDFImage.cpp @@ -284,8 +284,9 @@ SkPDFImage* SkPDFImage::addSMask(SkPDFImage* mask) { return mask; } -void SkPDFImage::getResources(SkTDArray<SkPDFObject*>* resourceList) { - GetResourcesHelper(&fResources, resourceList); +void SkPDFImage::getResources(const SkTSet<SkPDFObject*>& knownResourceObjects, + SkTSet<SkPDFObject*>* newResourceObjects) { + GetResourcesHelper(&fResources, knownResourceObjects, newResourceObjects); } SkPDFImage::SkPDFImage(SkStream* imageData, const SkBitmap& bitmap, |