Remove GetInputStreamBufferSize() method from FilterContext.

net/base/filter.cc

 // Copyright (c) 2011 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/base/filter.h"
 
 #include "base/file_path.h"
 #include "base/string_util.h"
 #include "net/base/gzip_filter.h"
 #include "net/base/io_buffer.h"
@@ skipping 16 matching lines @@
 const char kUncompressed[] = "uncompressed";
 
 // Mime types:
 const char kApplicationXGzip[]     = "application/x-gzip";
 const char kApplicationGzip[]      = "application/gzip";
 const char kApplicationXGunzip[]   = "application/x-gunzip";
 const char kApplicationXCompress[] = "application/x-compress";
 const char kApplicationCompress[]  = "application/compress";
 const char kTextHtml[]             = "text/html";
 
+// Buffer size allocated when de-compressing data.
+const int kFilterBufSize = 32 * 1024;

[jar (doing other things), 2011/02/25 18:37:24]

As per comment in filter.h: Please make this non-const, and probably a static
member of the class.  Please provide a static accessor (perhaps private?  used
only by the testing infrastructure?) to vary this value for testing purposes.

+
 }  // namespace
 
 FilterContext::~FilterContext() {
 }
 
 Filter::~Filter() {}
 
 Filter* Filter::Factory(const std::vector<FilterType>& filter_types,
                         const FilterContext& filter_context) {
-  DCHECK_GT(filter_context.GetInputStreamBufferSize(), 0);
-  if (filter_types.empty() || filter_context.GetInputStreamBufferSize() <= 0)
+  if (filter_types.empty())
     return NULL;
 
-
   Filter* filter_list = NULL;  // Linked list of filters.
   for (size_t i = 0; i < filter_types.size(); i++) {
     filter_list = PrependNewFilter(filter_types[i], filter_context,
                                    filter_list);
     if (!filter_list)
       return NULL;
   }
   return filter_list;
 }
 
@@ skipping 223 matching lines @@
   // This approach nicely handles the empty() list as well, and should work with
   // other (as yet undiscovered) proxies the choose to re-compressed with some
   // other encoding (such as bzip2, etc.).
   encoding_types->insert(encoding_types->begin(),
                          FILTER_TYPE_GZIP_HELPING_SDCH);
   encoding_types->insert(encoding_types->begin(), FILTER_TYPE_SDCH_POSSIBLE);
   return;
 }
 
 Filter::Filter(const FilterContext& filter_context)
-    : stream_buffer_(NULL),
-      stream_buffer_size_(0),
+    : stream_buffer_(new net::IOBuffer(kFilterBufSize)),
+      stream_buffer_size_(kFilterBufSize),
       next_stream_data_(NULL),
       stream_data_len_(0),
       next_filter_(NULL),
       last_status_(FILTER_NEED_MORE_DATA),
       filter_context_(filter_context) {
 }
 
 Filter::FilterStatus Filter::ReadFilteredData(char* dest_buffer,
                                               int* dest_len) {
   return Filter::FILTER_ERROR;
@@ skipping 24 matching lines @@
 Filter* Filter::PrependNewFilter(FilterType type_id,
                                  const FilterContext& filter_context,
                                  Filter* filter_list) {
   Filter* first_filter = NULL;  // Soon to be start of chain.
   switch (type_id) {
     case FILTER_TYPE_GZIP_HELPING_SDCH:
     case FILTER_TYPE_DEFLATE:
     case FILTER_TYPE_GZIP: {
       scoped_ptr<net::GZipFilter> gz_filter(
           new net::GZipFilter(filter_context));
-      if (gz_filter->InitBuffer()) {
-        if (gz_filter->InitDecoding(type_id)) {
-          first_filter = gz_filter.release();
-        }
+      if (gz_filter->InitDecoding(type_id)) {
+        first_filter = gz_filter.release();
       }
       break;
     }
     case FILTER_TYPE_SDCH:
     case FILTER_TYPE_SDCH_POSSIBLE: {
       scoped_ptr<net::SdchFilter> sdch_filter(
           new net::SdchFilter(filter_context));
-      if (sdch_filter->InitBuffer()) {
-        if (sdch_filter->InitDecoding(type_id)) {
-          first_filter = sdch_filter.release();
-        }
+      if (sdch_filter->InitDecoding(type_id)) {
+        first_filter = sdch_filter.release();
       }
       break;
     }
     default: {
       break;
     }
   }
 
   if (!first_filter) {
     // Cleanup and exit, since we can't construct this filter list.
     delete filter_list;
     return NULL;
   }
 
   first_filter->next_filter_.reset(filter_list);
   return first_filter;
 }
 
-bool Filter::InitBuffer() {
-  int buffer_size = filter_context_.GetInputStreamBufferSize();
-  DCHECK_GT(buffer_size, 0);
-  if (buffer_size <= 0 || stream_buffer())
-    return false;
-
-  stream_buffer_ = new net::IOBuffer(buffer_size);
-
-  if (stream_buffer()) {
-    stream_buffer_size_ = buffer_size;
-    return true;
-  }
-
-  return false;
-}
-
 void Filter::PushDataIntoNextFilter() {
   net::IOBuffer* next_buffer = next_filter_->stream_buffer();
   int next_size = next_filter_->stream_buffer_size();
   last_status_ = ReadFilteredData(next_buffer->data(), &next_size);
   if (FILTER_ERROR != last_status_)
     next_filter_->FlushStreamBuffer(next_size);
 }