SkPDF: SkPDFStream takes a unique_ptr

src/pdf/SkPDFFont.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 <ctype.h>
 
 #include "SkData.h"
@@ skipping 622 matching lines @@
             fontSize = subsetFontSize;
         }
     }
     if (subsetFontStream) {
         *fontStream = subsetFontStream;
         return fontSize;
     }
     fontData->rewind();
 
     // Fail over: just embed the whole font.
-    *fontStream = new SkPDFStream(fontData.get());
+    *fontStream = new SkPDFStream(std::move(fontData));
     return fontSize;
 }
 #endif
 
 ///////////////////////////////////////////////////////////////////////////////
 // class SkPDFGlyphSet
 ///////////////////////////////////////////////////////////////////////////////
 
 SkPDFGlyphSet::SkPDFGlyphSet() : fBitSet(SK_MaxU16 + 1) {
 }
@@ skipping 695 matching lines @@
 
         SkDynamicMemoryWStream content;
         setGlyphWidthAndBoundingBox(SkFloatToScalar(glyph.fAdvanceX), glyphBBox,
                                     &content);
         const SkPath* path = cache->findPath(glyph);
         if (path) {
             SkPDFUtils::EmitPath(*path, paint.getStyle(), &content);
             SkPDFUtils::PaintPath(paint.getStyle(), path->getFillType(),
                                   &content);
         }
-        std::unique_ptr<SkMemoryStream> glyphStream(new SkMemoryStream());
-        glyphStream->setData(content.copyToData())->unref();
-
         charProcs->insertObjRef(
-                characterName, sk_make_sp<SkPDFStream>(glyphStream.get()));
+                characterName, sk_make_sp<SkPDFStream>(
+                        std::unique_ptr<SkStreamAsset>(content.detachAsStream())));
     }
 
     encoding->insertObject("Differences", std::move(encDiffs));
 
     this->insertObject("CharProcs", std::move(charProcs));
     this->insertObject("Encoding", std::move(encoding));
 
     this->insertObject("FontBBox", makeFontBBox(bbox, 1000));
     this->insertInt("FirstChar", 1);
     this->insertInt("LastChar", lastGlyphID() - firstGlyphID() + 1);
@@ skipping 43 matching lines @@
     }
     return *canon->fCanEmbedTypeface.set(id, canEmbed);
 }
 
 void SkPDFFont::drop() {
     fTypeface = nullptr;
     fFontInfo = nullptr;
     fDescriptor = nullptr;
     this->SkPDFDict::drop();
 }