Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(248)

Unified Diff: net/spdy/buffered_spdy_framer.cc

Issue 2438163002: Remove SpdyFramerVisitorInterface::OnControlFrameHeaderData(). (Closed)
Patch Set: rebase Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/spdy/buffered_spdy_framer.h ('k') | net/spdy/mock_spdy_framer_visitor.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/spdy/buffered_spdy_framer.cc
diff --git a/net/spdy/buffered_spdy_framer.cc b/net/spdy/buffered_spdy_framer.cc
index 9148fe430665ddfa53282552d24c33a15137611e..f6c66db261e7360064fb4dba70ac968637e78e15 100644
--- a/net/spdy/buffered_spdy_framer.cc
+++ b/net/spdy/buffered_spdy_framer.cc
@@ -4,6 +4,7 @@
#include "net/spdy/buffered_spdy_framer.h"
+#include <algorithm>
#include <utility>
#include "base/logging.h"
@@ -16,10 +17,6 @@ namespace {
// GOAWAY frame debug data is only buffered up to this many bytes.
size_t kGoAwayDebugDataMaxSize = 1024;
-// Initial and maximum sizes for header block buffer.
-size_t kHeaderBufferInitialSize = 8 * 1024;
-size_t kHeaderBufferMaxSize = 256 * 1024;
-
} // namespace
BufferedSpdyFramer::BufferedSpdyFramer()
@@ -84,71 +81,6 @@ void BufferedSpdyFramer::OnSynReply(SpdyStreamId stream_id,
NOTREACHED();
}
-bool BufferedSpdyFramer::OnControlFrameHeaderData(SpdyStreamId stream_id,
- const char* header_data,
- size_t len) {
- CHECK_EQ(header_stream_id_, stream_id);
-
- if (len == 0) {
- // Indicates end-of-header-block.
- CHECK(header_buffer_valid_);
-
- SpdyHeaderBlock headers;
- if (!spdy_framer_.ParseHeaderBlockInBuffer(
- header_buffer_.data(), header_buffer_.size(), &headers)) {
- visitor_->OnStreamError(
- stream_id, "Could not parse Spdy Control Frame Header.");
- return false;
- }
- DCHECK(control_frame_fields_.get());
- switch (control_frame_fields_->type) {
- case SYN_STREAM:
- NOTREACHED();
- break;
- case SYN_REPLY:
- NOTREACHED();
- break;
- case HEADERS:
- visitor_->OnHeaders(control_frame_fields_->stream_id,
- control_frame_fields_->has_priority,
- control_frame_fields_->weight,
- control_frame_fields_->parent_stream_id,
- control_frame_fields_->exclusive,
- control_frame_fields_->fin, std::move(headers));
- break;
- case PUSH_PROMISE:
- visitor_->OnPushPromise(control_frame_fields_->stream_id,
- control_frame_fields_->promised_stream_id,
- std::move(headers));
- break;
- default:
- DCHECK(false) << "Unexpect control frame type: "
- << control_frame_fields_->type;
- break;
- }
- control_frame_fields_.reset(NULL);
- return true;
- }
-
- const size_t new_size = header_buffer_.size() + len;
- if (new_size > kHeaderBufferMaxSize) {
- header_buffer_valid_ = false;
- visitor_->OnStreamError(stream_id, "Received too much header data.");
- return false;
- }
-
- if (new_size > header_buffer_.capacity()) {
- // Grow |header_buffer_| exponentially to reduce memory allocations and
- // copies.
- size_t new_capacity = std::max(new_size, kHeaderBufferInitialSize);
- new_capacity = std::max(new_capacity, 2 * header_buffer_.capacity());
- new_capacity = std::min(new_capacity, kHeaderBufferMaxSize);
- header_buffer_.reserve(new_capacity);
- }
- header_buffer_.append(header_data, len);
- return true;
-}
-
void BufferedSpdyFramer::OnDataFrameHeader(SpdyStreamId stream_id,
size_t length,
bool fin) {
« no previous file with comments | « net/spdy/buffered_spdy_framer.h ('k') | net/spdy/mock_spdy_framer_visitor.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698