Change DrainableIOBuffer to IBuffer and int* in FilterData() arguments

net/filter/filter_source_stream.cc

 // 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/filter_source_stream.h"
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/logging.h"
 #include "base/metrics/histogram_macros.h"
@@ skipping 108 matching lines @@
   }
   if (result <= OK)
     upstream_end_reached_ = true;
   return result;
 }
 
 int FilterSourceStream::DoFilterData() {
   DCHECK(output_buffer_);
   DCHECK(drainable_input_buffer_);
 
-  int bytes_output =
-      FilterData(output_buffer_.get(), output_buffer_size_,
-                 drainable_input_buffer_.get(), upstream_end_reached_);
+  int consumed_bytes = 0;
+  int bytes_output = FilterData(output_buffer_.get(), output_buffer_size_,
+                                drainable_input_buffer_.get(),
+                                drainable_input_buffer_->BytesRemaining(),
+                                &consumed_bytes, upstream_end_reached_);
+  DCHECK_LE(consumed_bytes, drainable_input_buffer_->BytesRemaining());
+  DCHECK(bytes_output != 0 ||
+         consumed_bytes == drainable_input_buffer_->BytesRemaining());
+
   if (bytes_output == ERR_CONTENT_DECODING_FAILED) {
     UMA_HISTOGRAM_ENUMERATION("Net.ContentDecodingFailed.FilterType", type(),
                               TYPE_MAX);
   }
   // FilterData() is not allowed to return ERR_IO_PENDING.
   DCHECK_NE(ERR_IO_PENDING, bytes_output);
 
+  if (consumed_bytes > 0)
+    drainable_input_buffer_->DidConsume(consumed_bytes);
+
   // Received data or encountered an error.
   if (bytes_output != 0)
     return bytes_output;
   // If no data is returned, continue reading if |this| needs more input.
   if (NeedMoreData()) {
     DCHECK_EQ(0, drainable_input_buffer_->BytesRemaining());
     next_state_ = STATE_READ_DATA;
   }
   return bytes_output;
 }
 
 void FilterSourceStream::OnIOComplete(int result) {
   DCHECK_EQ(STATE_READ_DATA_COMPLETE, next_state_);
 
   int rv = DoLoop(result);
   if (rv == ERR_IO_PENDING)
     return;
 
   output_buffer_ = nullptr;
   output_buffer_size_ = 0;
 
   base::ResetAndReturn(&callback_).Run(rv);
 }
 
 bool FilterSourceStream::NeedMoreData() const {
   return !upstream_end_reached_;
 }
 
 }  // namespace net