[ZLIB] Add support for windowBits, memLevel, raw

runtime/bin/filter.cc

 // Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "bin/dartutils.h"
 #include "bin/filter.h"
 #include "bin/io_buffer.h"
 
 #include "include/dart_api.h"
 
 
 namespace dart {
 namespace bin {
 
-const int kZlibFlagMemUsage = 8;
 const int kZLibFlagWindowBits = 15;
 const int kZLibFlagUseGZipHeader = 16;
 const int kZLibFlagAcceptAnyHeader = 32;
 
 static const int kFilterPointerNativeField = 0;
 
 Filter* GetFilter(Dart_Handle filter_obj) {
   Filter* filter;
   Dart_Handle result = Filter::GetFilterPointerNativeField(filter_obj, &filter);
   if (Dart_IsError(result)) {
     Dart_PropagateError(result);
   }
   if (filter == NULL) {
     Dart_ThrowException(DartUtils::NewInternalError("Filter destroyed"));
   }
   return filter;
 }
 
 void EndFilter(Dart_Handle filter_obj, Filter* filter) {
   Filter::SetFilterPointerNativeField(filter_obj, NULL);
   delete filter;
 }
 
 void FUNCTION_NAME(Filter_CreateZLibInflate)(Dart_NativeArguments args) {
   Dart_Handle filter_obj = Dart_GetNativeArgument(args, 0);
-  Filter* filter = new ZLibInflateFilter();
+  Dart_Handle wBits_obj = Dart_GetNativeArgument(args, 1);
+  int64_t windowBits;
+  if (Dart_IsError(Dart_IntegerToInt64(wBits_obj, &windowBits))) {
+    Dart_ThrowException(DartUtils::NewInternalError(
+        "Failed to get 'windowBits' parameter"));
+  }
+  Dart_Handle raw_obj = Dart_GetNativeArgument(args, 2);
+  bool raw;
+  if (Dart_IsError(Dart_BooleanValue(raw_obj, &raw))) {
+    Dart_ThrowException(DartUtils::NewInternalError(
+        "Failed to get 'raw' parameter"));
+  }
+  Filter* filter = new ZLibInflateFilter(windowBits, raw);
   if (filter == NULL || !filter->Init()) {
     delete filter;
     Dart_ThrowException(DartUtils::NewInternalError(
         "Failed to create ZLibInflateFilter"));
   }
   Dart_Handle result = Filter::SetFilterPointerNativeField(filter_obj, filter);
   if (Dart_IsError(result)) {
     delete filter;
     Dart_PropagateError(result);
   }
 }
 
 void FUNCTION_NAME(Filter_CreateZLibDeflate)(Dart_NativeArguments args) {
   Dart_Handle filter_obj = Dart_GetNativeArgument(args, 0);
   Dart_Handle gzip_obj = Dart_GetNativeArgument(args, 1);
-  Dart_Handle level_obj = Dart_GetNativeArgument(args, 2);
   bool gzip;
   if (Dart_IsError(Dart_BooleanValue(gzip_obj, &gzip))) {
     Dart_ThrowException(DartUtils::NewInternalError(
         "Failed to get 'gzip' parameter"));
   }
+  Dart_Handle level_obj = Dart_GetNativeArgument(args, 2);
   int64_t level;
   if (Dart_IsError(Dart_IntegerToInt64(level_obj, &level))) {
     Dart_ThrowException(DartUtils::NewInternalError(
         "Failed to get 'level' parameter"));
   }
-  Filter* filter = new ZLibDeflateFilter(gzip, level);
+  Dart_Handle wBits_obj = Dart_GetNativeArgument(args, 3);
+  int64_t windowBits;
+  if (Dart_IsError(Dart_IntegerToInt64(wBits_obj, &windowBits))) {
+    Dart_ThrowException(DartUtils::NewInternalError(
+        "Failed to get 'windowBits' parameter"));
+  }
+  Dart_Handle raw_obj = Dart_GetNativeArgument(args, 4);
+  bool raw;
+  if (Dart_IsError(Dart_BooleanValue(raw_obj, &raw))) {
+    Dart_ThrowException(DartUtils::NewInternalError(
+        "Failed to get 'raw' parameter"));
+  }
+  Dart_Handle mLevel_obj = Dart_GetNativeArgument(args, 5);
+  int64_t memLevel;
+  if (Dart_IsError(Dart_IntegerToInt64(mLevel_obj, &memLevel))) {
+    Dart_ThrowException(DartUtils::NewInternalError(
+        "Failed to get 'memLevel' parameter"));
+  }
+  Filter* filter = new ZLibDeflateFilter(gzip, level, windowBits, raw,
+                                         memLevel);
   if (filter == NULL || !filter->Init()) {
     delete filter;
     Dart_ThrowException(DartUtils::NewInternalError(
         "Failed to create ZLibDeflateFilter"));
   }
   Dart_Handle result = Filter::SetFilterPointerNativeField(filter_obj, filter);
   if (Dart_IsError(result)) {
     delete filter;
     Dart_PropagateError(result);
   }
@@ skipping 104 matching lines @@
 }
 
 
 ZLibDeflateFilter::~ZLibDeflateFilter() {
   delete[] current_buffer_;
   if (initialized()) deflateEnd(&stream_);
 }
 
 
 bool ZLibDeflateFilter::Init() {
+  int windowBits = windowBits_;
+  if (raw_) {
+    windowBits *= -1;
+  } else if (gzip_) {
+    windowBits += kZLibFlagUseGZipHeader;
+  }
   stream_.zalloc = Z_NULL;
   stream_.zfree = Z_NULL;
   stream_.opaque = Z_NULL;
-  int result = deflateInit2(
-      &stream_,
-      level_,
-      Z_DEFLATED,
-      kZLibFlagWindowBits | (gzip_ ? kZLibFlagUseGZipHeader : 0),
-      kZlibFlagMemUsage,
-      Z_DEFAULT_STRATEGY);
+  int result = deflateInit2(&stream_, level_, Z_DEFLATED, windowBits, memLevel_,
+                            Z_DEFAULT_STRATEGY);
   if (result == Z_OK) {
     set_initialized(true);
     return true;
   }
   return false;
 }
 
 
 bool ZLibDeflateFilter::Process(uint8_t* data, intptr_t length) {
   if (current_buffer_ != NULL) return false;
@@ skipping 10 matching lines @@
   stream_.next_out = buffer;
   switch (deflate(&stream_,
                   end ? Z_FINISH : flush ? Z_SYNC_FLUSH : Z_NO_FLUSH)) {
     case Z_STREAM_END:
     case Z_BUF_ERROR:
     case Z_OK: {
       intptr_t processed = length - stream_.avail_out;
       if (processed == 0) {
         delete[] current_buffer_;
         current_buffer_ = NULL;
-        return 0;
-      } else {
-        // We processed data, should be called again.
-        return processed;
       }
+      return processed;
     }
 
     default:
     case Z_STREAM_ERROR:
-      // An error occoured.
+      // An error occurred.
       delete[] current_buffer_;
       current_buffer_ = NULL;
       return -1;
   }
 }
 
 
 ZLibInflateFilter::~ZLibInflateFilter() {
   delete[] current_buffer_;
   if (initialized()) inflateEnd(&stream_);
 }
 
 
 bool ZLibInflateFilter::Init() {
+  int windowBits = raw_ ?
+      -1 * windowBits_ :
+      windowBits_ | kZLibFlagAcceptAnyHeader;
+
   stream_.zalloc = Z_NULL;
   stream_.zfree = Z_NULL;
   stream_.opaque = Z_NULL;
-  int result = inflateInit2(&stream_,
-                            kZLibFlagWindowBits | kZLibFlagAcceptAnyHeader);
+  int result = inflateInit2(&stream_, windowBits);
   if (result == Z_OK) {
     set_initialized(true);
     return true;
   }
   return false;
 }
 
 
 bool ZLibInflateFilter::Process(uint8_t* data, intptr_t length) {
   if (current_buffer_ != NULL) return false;
@@ skipping 11 matching lines @@
   stream_.next_out = buffer;
   switch (inflate(&stream_,
                   end ? Z_FINISH : flush ? Z_SYNC_FLUSH : Z_NO_FLUSH)) {
     case Z_STREAM_END:
     case Z_BUF_ERROR:
     case Z_OK: {
       intptr_t processed = length - stream_.avail_out;
       if (processed == 0) {
         delete[] current_buffer_;
         current_buffer_ = NULL;
-        return 0;
-      } else {
-        // We processed data, should be called again.
-        return processed;
       }
+      return processed;
     }
 
     default:
     case Z_MEM_ERROR:
     case Z_NEED_DICT:
     case Z_DATA_ERROR:
     case Z_STREAM_ERROR:
       // An error occoured.
       delete[] current_buffer_;
       current_buffer_ = NULL;
       return -1;
   }
 }
 
 }  // namespace bin
 }  // namespace dart