Unwind PDFObject destructor calls into heap instead of stack. Notice: the order of the destructors …

src/pdf/SkPDFDevice.cpp

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "SkPDFDevice.h"
@@ skipping 626 matching lines @@
         fFontGlyphUsage.reset(new SkPDFGlyphSetMap());
     }
 }
 
 void SkPDFDevice::cleanUp(bool clearFontUsage) {
     fGraphicStateResources.unrefAll();
     fXObjectResources.unrefAll();
     fFontResources.unrefAll();
     fShaderResources.unrefAll();
     SkSafeUnref(fAnnotations);
-    SkSafeUnref(fResourceDict);
+
+    // Transfer ownership of fResourceDict to list.
+    SkTDArray<SkPDFObject*> list;
+    list.push(fResourceDict);
+    fResourceDict = NULL;
+
+    SkPDFObject::safeUnref(&list);
 
     if (clearFontUsage) {
         fFontGlyphUsage->reset();
     }
 }
 
 uint32_t SkPDFDevice::getDeviceCapabilities() {
     return kVector_Capability;
 }
 
@@ skipping 1062 matching lines @@
 }
 
 bool SkPDFDevice::onReadPixels(const SkBitmap& bitmap, int x, int y,
                                SkCanvas::Config8888) {
     return false;
 }
 
 bool SkPDFDevice::allowImageFilter(SkImageFilter*) {
     return false;
 }