SkPDF/Deflate: clean up old SkFlate code

src/pdf/SkDeflate.h

 
 /*
  * Copyright 2010 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #ifndef SkFlate_DEFINED
 #define SkFlate_DEFINED
 
 #include "SkTypes.h"
 
 #include "SkStream.h"
-class SkData;
 
-/** \class SkFlate
-    A class to provide access to the flate compression algorithm.
-*/
-class SkFlate {
-public:
-    /**
-     *  Use the flate compression algorithm to compress the data in src,
-     *  putting the result into dst.  Returns false if an error occurs.
-     */
-    static bool Deflate(SkStream* src, SkWStream* dst);
-
-    /**
-     *  Use the flate compression algorithm to compress the data in src,
-     *  putting the result into dst.  Returns false if an error occurs.
-     */
-    static bool Deflate(const void* src, size_t len, SkWStream* dst);
-
-    /**
-     *  Use the flate compression algorithm to compress the data,
-     *  putting the result into dst.  Returns false if an error occurs.
-     */
-    static bool Deflate(const SkData*, SkWStream* dst);
-
-    /** Use the flate compression algorithm to decompress the data in src,
-        putting the result into dst.  Returns false if an error occurs.
-     */
-    static bool Inflate(SkStream* src, SkWStream* dst);
-};
+/**
+ *  Use the un-deflate compression algorithm to decompress the data in src,
+ *  returning the result.  Returns NULL if an error occurs.
+ */
+SkStreamAsset* SkInflate(SkStream* src);

[mtklein_C, 2015/08/18 19:33:09]

If only used for testing, let's move it out of src/.

[hal.canary, 2015/08/18 20:06:23]

Done.

Moved to tests/PDFDeflateWStreamTest.cpp

 
 /**
   * Wrap a stream in this class to compress the information written to
   * this stream using the Deflate algorithm.  Uses Zlib's
   * Z_DEFAULT_COMPRESSION level.
   *
   * See http://en.wikipedia.org/wiki/DEFLATE
   */
 class SkDeflateWStream : public SkWStream {
 public:
@@ skipping 10 matching lines @@
     // The SkWStream interface:
     bool write(const void*, size_t) override;
     size_t bytesWritten() const override;
 
 private:
     struct Impl;
     SkAutoTDelete<Impl> fImpl;
 };
 
 #endif  // SkFlate_DEFINED