SkPDF s/SkAutoTDelete/std::unique_ptr/

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"
 
 #include "SkAnnotationKeys.h"
@@ skipping 574 matching lines @@
     SkISize size = SkISize::Make(cinfo.fInfo.width(), cinfo.fInfo.height());
     return SkPDFDevice::Create(size, fRasterDpi, fDocument);
 }
 
 SkPDFCanon* SkPDFDevice::getCanon() const { return fDocument->canon(); }
 
 
 struct ContentEntry {
     GraphicStateEntry fState;
     SkDynamicMemoryWStream fContent;
-    SkAutoTDelete<ContentEntry> fNext;
+    std::unique_ptr<ContentEntry> fNext;

[bungeman-skia, 2016/03/25 19:54:22]

Hopefully this doesn't break the Android NDK build (unique_ptr to incomplete
type), but it probably will. If you do submit this, you'll need to keep an eye
on it. See SkHackyAutoTDelete for the current workaround elsewhere.

[hal.canary, 2016/03/28 14:23:32]

I'll hold off on these.  This should be a linked list;  I'll clean this up and
make it more readable in another CL.

 
     // If the stack is too deep we could get Stack Overflow.
     // So we manually destruct the object.
     ~ContentEntry() {
         ContentEntry* val = fNext.release();
         while (val != nullptr) {
             ContentEntry* valNext = val->fNext.release();
             // When the destructor is called, fNext is nullptr and exits.
             delete val;
             val = valNext;
@@ skipping 804 matching lines @@
 }
 
 ContentEntry* SkPDFDevice::getLastContentEntry() {
     if (fDrawingArea == kContent_DrawingArea) {
         return fLastContentEntry;
     } else {
         return fLastMarginContentEntry;
     }
 }
 
-SkAutoTDelete<ContentEntry>* SkPDFDevice::getContentEntries() {
+std::unique_ptr<ContentEntry>* SkPDFDevice::getContentEntries() {
     if (fDrawingArea == kContent_DrawingArea) {
         return &fContentEntries;
     } else {
         return &fMarginContentEntries;
     }
 }
 
 void SkPDFDevice::setLastContentEntry(ContentEntry* contentEntry) {
     if (fDrawingArea == kContent_DrawingArea) {
         fLastContentEntry = contentEntry;
@@ skipping 324 matching lines @@
     }
     // TODO(vandebo): Figure out how/if we can handle the following modes:
     // Xor, Plus.
 
     // Dst xfer mode doesn't draw source at all.
     if (xfermode == SkXfermode::kDst_Mode) {
         return nullptr;
     }
 
     ContentEntry* entry;
-    SkAutoTDelete<ContentEntry> newEntry;
+    std::unique_ptr<ContentEntry> newEntry;
 
     ContentEntry* lastContentEntry = getLastContentEntry();
     if (lastContentEntry && lastContentEntry->fContent.getOffset() == 0) {
         entry = lastContentEntry;
     } else {
         newEntry.reset(new ContentEntry);
         entry = newEntry.get();
     }
 
     populateGraphicStateEntryFromPaint(matrix, *clipStack, clipRegion, paint,
                                        hasText, &entry->fState);
     if (lastContentEntry && xfermode != SkXfermode::kDstOver_Mode &&
             entry->fState.compareInitialState(lastContentEntry->fState)) {
         return lastContentEntry;
     }
 
-    SkAutoTDelete<ContentEntry>* contentEntries = getContentEntries();
+    std::unique_ptr<ContentEntry>* contentEntries = getContentEntries();
     if (!lastContentEntry) {
         contentEntries->reset(entry);
         setLastContentEntry(entry);
     } else if (xfermode == SkXfermode::kDstOver_Mode) {
         entry->fNext.reset(contentEntries->release());
         contentEntries->reset(entry);
     } else {
         lastContentEntry->fNext.reset(entry);
         setLastContentEntry(entry);
     }
@@ skipping 17 matching lines @@
         SkASSERT(!dst);
         return;
     }
     if (xfermode == SkXfermode::kDstOver_Mode) {
         SkASSERT(!dst);
         ContentEntry* firstContentEntry = getContentEntries()->get();
         if (firstContentEntry->fContent.getOffset() == 0) {
             // For DstOver, an empty content entry was inserted before the rest
             // of the content entries. If nothing was drawn, it needs to be
             // removed.
-            SkAutoTDelete<ContentEntry>* contentEntries = getContentEntries();
+            std::unique_ptr<ContentEntry>* contentEntries = getContentEntries();
             contentEntries->reset(firstContentEntry->fNext.release());
         }
         return;
     }
     if (!dst) {
         SkASSERT(xfermode == SkXfermode::kSrc_Mode ||
                  xfermode == SkXfermode::kSrcOut_Mode);
         return;
     }
 
@@ skipping 429 matching lines @@
         if (!pdfimage) {
             return;
         }
         fDocument->serialize(pdfimage);  // serialize images early.
         fDocument->canon()->addPDFBitmap(key, pdfimage);
     }
     // TODO(halcanary): addXObjectResource() should take a sk_sp<SkPDFObject>
     SkPDFUtils::DrawFormXObject(this->addXObjectResource(pdfimage.get()),
                                 &content.entry()->fContent);
 }