Add net::BrotliSourceStream

net/filter/brotli_source_stream.cc

Index: net/filter/brotli_source_stream.cc
diff --git a/net/filter/brotli_filter.cc b/net/filter/brotli_source_stream.cc
similarity index 54%
copy from net/filter/brotli_filter.cc
copy to net/filter/brotli_source_stream.cc
index 41f507c6d45fcf8073398d02dfef017673ede078..a7f7283f6abeb3e04f7649747d931b5834f138fc 100644
--- a/net/filter/brotli_filter.cc
+++ b/net/filter/brotli_source_stream.cc
@@ -1,47 +1,46 @@
-// Copyright 2015 The Chromium Authors. All rights reserved.
+// Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "net/filter/brotli_filter.h"
+#include "net/filter/brotli_source_stream.h"
 
+#include "base/bind.h"
 #include "base/bit_cast.h"
+#include "base/logging.h"
 #include "base/macros.h"
+#include "base/memory/ptr_util.h"
 #include "base/metrics/histogram_macros.h"
-#include "base/numerics/safe_conversions.h"
-#include "base/numerics/safe_math.h"
+#include "net/base/io_buffer.h"
 #include "third_party/brotli/dec/decode.h"
 
 namespace net {
 
 namespace {
+
+const char kBrotli[] = "BROTLI";
 const uint8_t kGzipHeader[] = {0x1f, 0x8b, 0x08};
-}
 
-// BrotliFilter applies Brotli content decoding to a data stream.
-// Brotli format specification: http://www.ietf.org/id/draft-alakuijala-brotli
-//
-// BrotliFilter is a subclass of Filter. See the latter's header file filter.h
-// for sample usage.
-class BrotliFilter : public Filter {
+// BrotliSourceStream applies Brotli content decoding to a data stream.
+// Brotli format specification: http://www.ietf.org/id/draft-alakuijala-brotli.
+class BrotliSourceStream : public FilterSourceStream {
  public:
-  BrotliFilter(FilterType type)
-      : Filter(type),
+  explicit BrotliSourceStream(std::unique_ptr<SourceStream> upstream)
+      : FilterSourceStream(SourceStream::TYPE_BROTLI, std::move(upstream)),
         decoding_status_(DecodingStatus::DECODING_IN_PROGRESS),
         used_memory_(0),
         used_memory_maximum_(0),
         consumed_bytes_(0),
         produced_bytes_(0),
         gzip_header_detected_(true) {
-    brotli_state_ = BrotliCreateState(BrotliFilter::AllocateMemory,
-                                      BrotliFilter::FreeMemory, this);
+    brotli_state_ = BrotliCreateState(AllocateMemory, FreeMemory, this);
     CHECK(brotli_state_);
   }
 
-  ~BrotliFilter() override {
+  ~BrotliSourceStream() override {
     BrotliErrorCode error_code = BrotliGetErrorCode(brotli_state_);
     BrotliDestroyState(brotli_state_);
     brotli_state_ = nullptr;
-    DCHECK(used_memory_ == 0);
+    DCHECK_EQ(0u, used_memory_);
 
     // Don't report that gzip header was detected in case of lack of input.
     gzip_header_detected_ &= (consumed_bytes_ >= sizeof(kGzipHeader));
@@ -66,47 +65,39 @@ class BrotliFilter : public Filter {
     }
 
     // All code here is for gathering stats, and can be removed when
-    // BrotliFilter is considered stable.
-    static const int kBuckets = 48;
-    static const int64_t kMaxKb = 1 << (kBuckets / 3);  // 64MiB in KiB
+    // BrotliSourceStream is considered stable.
+    const int kBuckets = 48;
+    const int64_t kMaxKb = 1 << (kBuckets / 3);  // 64MiB in KiB
     UMA_HISTOGRAM_CUSTOM_COUNTS("BrotliFilter.UsedMemoryKB",
                                 used_memory_maximum_ / 1024, 1, kMaxKb,
                                 kBuckets);
   }
 
-  // Decodes the pre-filter data and writes the output into the |dest_buffer|
-  // passed in.
-  // The function returns FilterStatus. See filter.h for its description.
-  //
-  // Upon entry, |*dest_len| is the total size (in number of chars) of the
-  // destination buffer. Upon exit, |*dest_len| is the actual number of chars
-  // written into the destination buffer.
-  //
-  // This function will fail if there is no pre-filter data in the
-  // |stream_buffer_|. On the other hand, |*dest_len| can be 0 upon successful
-  // return. For example, decompressor may process some pre-filter data
-  // but not produce output yet.
-  FilterStatus ReadFilteredData(char* dest_buffer, int* dest_len) override {
-    if (!dest_buffer || !dest_len)
-      return Filter::FILTER_ERROR;
-
-    if (decoding_status_ == DecodingStatus::DECODING_DONE) {
-      *dest_len = 0;
-      return Filter::FILTER_DONE;
-    }
+ private:
+  // Reported in UMA and must be kept in sync with the histograms.xml file.
+  enum class DecodingStatus : int {
+    DECODING_IN_PROGRESS = 0,
+    DECODING_DONE,
+    DECODING_ERROR,
 
-    if (decoding_status_ != DecodingStatus::DECODING_IN_PROGRESS)
-      return Filter::FILTER_ERROR;
+    DECODING_STATUS_COUNT
+    // DECODING_STATUS_COUNT must always be the last element in this enum.
+  };
 
-    size_t output_buffer_size = base::checked_cast<size_t>(*dest_len);
-    size_t input_buffer_size = base::checked_cast<size_t>(stream_data_len_);
+  // SourceStream implementation
+  std::string GetTypeAsString() const override { return kBrotli; }
 
+  int FilterData(IOBuffer* output_buffer,
+                 int output_buffer_size,
+                 IOBuffer* input_buffer,
+                 int input_buffer_size,
+                 int* consumed_bytes,
+                 bool /*upstream_eof_reached*/) override {
+    const uint8_t* next_in = bit_cast<uint8_t*>(input_buffer->data());
     size_t available_in = input_buffer_size;
-    const uint8_t* next_in = bit_cast<uint8_t*>(next_stream_data_);
+    uint8_t* next_out = bit_cast<uint8_t*>(output_buffer->data());
     size_t available_out = output_buffer_size;
-    uint8_t* next_out = bit_cast<uint8_t*>(dest_buffer);
     size_t total_out = 0;
-
     // Check if start of the input stream looks like gzip stream.
     for (size_t i = consumed_bytes_; i < sizeof(kGzipHeader); ++i) {
       if (!gzip_header_detected_)
@@ -120,49 +111,40 @@ class BrotliFilter : public Filter {
         BrotliDecompressStream(&available_in, &next_in, &available_out,
                                &next_out, &total_out, brotli_state_);
 
-    CHECK(available_in <= input_buffer_size);
-    CHECK(available_out <= output_buffer_size);
-    consumed_bytes_ += input_buffer_size - available_in;
-    produced_bytes_ += output_buffer_size - available_out;
+    size_t bytes_used = input_buffer_size - available_in;
+    size_t bytes_written = output_buffer_size - available_out;
+    CHECK_GE(bytes_used, 0u);
+    CHECK_GE(bytes_written, 0u);
+    produced_bytes_ += bytes_written;
+    consumed_bytes_ += bytes_used;
 
-    base::CheckedNumeric<size_t> safe_bytes_written(output_buffer_size);
-    safe_bytes_written -= available_out;
-    int bytes_written =
-        base::checked_cast<int>(safe_bytes_written.ValueOrDie());
+    *consumed_bytes = bytes_used;
 
     switch (result) {
       case BROTLI_RESULT_NEEDS_MORE_OUTPUT:
-      // Fall through.
+        return bytes_written;
       case BROTLI_RESULT_SUCCESS:
-        *dest_len = bytes_written;
-        stream_data_len_ = base::checked_cast<int>(available_in);
-        next_stream_data_ = bit_cast<char*>(next_in);
-        if (result == BROTLI_RESULT_SUCCESS) {
-          decoding_status_ = DecodingStatus::DECODING_DONE;
-          return Filter::FILTER_DONE;
-        }
-        return Filter::FILTER_OK;
-
+        decoding_status_ = DecodingStatus::DECODING_DONE;
+        return bytes_written;
       case BROTLI_RESULT_NEEDS_MORE_INPUT:
-        *dest_len = bytes_written;
-        stream_data_len_ = 0;
-        next_stream_data_ = nullptr;
-        return Filter::FILTER_NEED_MORE_DATA;
-
+        // Decompress needs more input has consumed all existing input.
+        DCHECK_EQ(*consumed_bytes, input_buffer_size);
+        decoding_status_ = DecodingStatus::DECODING_IN_PROGRESS;
+        return bytes_written;
+      // If the decompressor threw an error, fail synchronously.
       default:
         decoding_status_ = DecodingStatus::DECODING_ERROR;
-        return Filter::FILTER_ERROR;
+        return ERR_CONTENT_DECODING_FAILED;
     }
   }
 
- private:
   static void* AllocateMemory(void* opaque, size_t size) {
-    BrotliFilter* filter = reinterpret_cast<BrotliFilter*>(opaque);
+    BrotliSourceStream* filter = reinterpret_cast<BrotliSourceStream*>(opaque);
     return filter->AllocateMemoryInternal(size);
   }
 
   static void FreeMemory(void* opaque, void* address) {
-    BrotliFilter* filter = reinterpret_cast<BrotliFilter*>(opaque);
+    BrotliSourceStream* filter = reinterpret_cast<BrotliSourceStream*>(opaque);
     filter->FreeMemoryInternal(address);
   }
 
@@ -185,22 +167,10 @@ class BrotliFilter : public Filter {
     free(&array[-1]);
   }
 
-  // Reported in UMA and must be kept in sync with the histograms.xml file.
-  enum class DecodingStatus : int {
-    DECODING_IN_PROGRESS = 0,
-    DECODING_DONE,
-    DECODING_ERROR,
-
-    DECODING_STATUS_COUNT
-    // DECODING_STATUS_COUNT must always be the last element in this enum.
-  };
+  BrotliState* brotli_state_;
 
-  // Tracks the status of decoding.
-  // This variable is updated only by ReadFilteredData.
   DecodingStatus decoding_status_;
 
-  BrotliState* brotli_state_;
-
   size_t used_memory_;
   size_t used_memory_maximum_;
   size_t consumed_bytes_;
@@ -208,11 +178,14 @@ class BrotliFilter : public Filter {
 
   bool gzip_header_detected_;
 
-  DISALLOW_COPY_AND_ASSIGN(BrotliFilter);
+  DISALLOW_COPY_AND_ASSIGN(BrotliSourceStream);
 };
 
-Filter* CreateBrotliFilter(Filter::FilterType type_id) {
-  return new BrotliFilter(type_id);
+}  // namespace
+
+std::unique_ptr<FilterSourceStream> CreateBrotliSourceStream(
+    std::unique_ptr<SourceStream> previous) {
+  return base::WrapUnique(new BrotliSourceStream(std::move(previous)));
 }
 
 }  // namespace net