use general SkWStream for parameter

git-svn-id: http://skia.googlecode.com/svn/trunk@1719 2bbb7eff-a529-9590-31e7-b0007b416f81

diff --git a/include/core/SkFlate.h b/include/core/SkFlate.h
index b606742150a05084d610dcd52a9b6a701e50d24b..ef76f68450fa173aa6cd08da54c8dbb398500b52 100644 (file)
--- a/include/core/SkFlate.h
+++ b/include/core/SkFlate.h
@@ -19,7 +19,7 @@
 
 #include "SkTypes.h"
 
-class SkDynamicMemoryWStream;
+class SkWStream;
 class SkStream;
 
 /** \class SkFlate
@@ -34,12 +34,12 @@ 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, SkDynamicMemoryWStream* dst);
+    static bool Deflate(SkStream* src, 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, SkDynamicMemoryWStream* dst);
+    static bool Inflate(SkStream* src, SkWStream* dst);
 };
 
 #endif

diff --git a/src/core/SkFlate.cpp b/src/core/SkFlate.cpp
index 99b331eb28d060b70b5a15c2f33df8bf7c874a58..5acf2abfa029ed4aaa2dad106005bf790ae0b581 100644 (file)
--- a/src/core/SkFlate.cpp
+++ b/src/core/SkFlate.cpp
@@ -19,8 +19,8 @@
 
 #ifndef SK_ZLIB_INCLUDE
 bool SkFlate::HaveFlate() { return false; }
-bool SkFlate::Deflate(SkStream*, SkDynamicMemoryWStream*) { return false; }
-bool SkFlate::Inflate(SkStream*, SkDynamicMemoryWStream*) { return false; }
+bool SkFlate::Deflate(SkStream*, SkWStream*) { return false; }
+bool SkFlate::Inflate(SkStream*, SkWStream*) { return false; }
 #else
 
 // static
@@ -39,7 +39,7 @@ namespace {
 // static
 const size_t kBufferSize = 1024;
 
-bool doFlate(bool compress, SkStream* src, SkDynamicMemoryWStream* dst) {
+bool doFlate(bool compress, SkStream* src, SkWStream* dst) {
     uint8_t inputBuffer[kBufferSize];
     uint8_t outputBuffer[kBufferSize];
     z_stream flateData;
@@ -119,12 +119,12 @@ bool doFlate(bool compress, SkStream* src, SkDynamicMemoryWStream* dst) {
 }
 
 // static
-bool SkFlate::Deflate(SkStream* src, SkDynamicMemoryWStream* dst) {
+bool SkFlate::Deflate(SkStream* src, SkWStream* dst) {
     return doFlate(true, src, dst);
 }
 
 // static
-bool SkFlate::Inflate(SkStream* src, SkDynamicMemoryWStream* dst) {
+bool SkFlate::Inflate(SkStream* src, SkWStream* dst) {
     return doFlate(false, src, dst);
 }