SkPDF/Deflate: clean up old SkFlate code

src/pdf/SkPDFStream.cpp

 
 /*
  * Copyright 2010 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "SkData.h"
@@ skipping 11 matching lines @@
 }
 
 SkPDFStream::~SkPDFStream() {}
 
 void SkPDFStream::emitObject(SkWStream* stream,
                              const SkPDFObjNumMap& objNumMap,
                              const SkPDFSubstituteMap& substitutes) {
     if (fState == kUnused_State) {
         fState = kNoCompression_State;
         SkDynamicMemoryWStream compressedData;
-
-        SkAssertResult(
-                SkFlate::Deflate(fDataStream.get(), &compressedData));
+        SkDeflateWStream deflateWStream(&compressedData);
+        SkAssertResult(SkStreamCopy(&deflateWStream, fDataStream.get()));
+        deflateWStream.finalize();
         SkAssertResult(fDataStream->rewind());
         if (compressedData.getOffset() < this->dataSize()) {
             SkAutoTDelete<SkStream> compressed(
                     compressedData.detachAsStream());
             this->setData(compressed.get());
             this->insertName("Filter", "FlateDecode");
         }
         fState = kCompressed_State;
         this->insertInt("Length", this->dataSize());
     }
@@ skipping 16 matching lines @@
     // Code assumes that the stream starts at the beginning and is rewindable.
     // SkStreamRewindableFromSkStream will try stream->duplicate().
     fDataStream.reset(SkStreamRewindableFromSkStream(stream));
     SkASSERT(fDataStream.get());
 }
 
 size_t SkPDFStream::dataSize() const {
     SkASSERT(fDataStream->hasLength());
     return fDataStream->getLength();
 }