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 /tests/PDFPrimitivesTest.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 'tests/PDFPrimitivesTest.cpp')
| -rw-r--r-- | tests/PDFPrimitivesTest.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/PDFPrimitivesTest.cpp b/tests/PDFPrimitivesTest.cpp index 7f6bc3485d..3b54d1772d 100644 --- a/tests/PDFPrimitivesTest.cpp +++ b/tests/PDFPrimitivesTest.cpp @@ -21,10 +21,10 @@ class SkPDFTestDict : public SkPDFDict { public: - void getResources(SkTDArray<SkPDFObject*>* resourceList) { - resourceList->setReserve(resourceList->count() + fResources.count()); + virtual void getResources(const SkTSet<SkPDFObject*>& knownResourceObjects, + SkTSet<SkPDFObject*>* newResourceObjects) { for (int i = 0; i < fResources.count(); i++) { - resourceList->push(fResources[i]); + newResourceObjects->add(fResources[i]); fResources[i]->ref(); } } |