SPDY - integration of spdy/3 code.

net/spdy/buffered_spdy_framer.cc

 // Copyright (c) 2012 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/spdy/buffered_spdy_framer.h"
 
 #include "base/logging.h"
 
 namespace spdy {
 
 BufferedSpdyFramer::BufferedSpdyFramer(int version)
-    : spdy_framer_(),
+    : spdy_framer_(version),
       visitor_(NULL),
       header_buffer_used_(0),
       header_buffer_valid_(false),
       header_stream_id_(SpdyFramer::kInvalidStream),
       frames_received_(0) {
   memset(header_buffer_, 0, sizeof(header_buffer_));
 }
 
 BufferedSpdyFramer::~BufferedSpdyFramer() {
 }
@@ skipping 19 matching lines @@
       break;
     case GOAWAY:
       visitor_->OnGoAway(
           *reinterpret_cast<const spdy::SpdyGoAwayControlFrame*>(frame));
       break;
     case PING:
       visitor_->OnPing(
           *reinterpret_cast<const spdy::SpdyPingControlFrame*>(frame));
       break;
     case SETTINGS:
-      visitor_->OnSettings(
-          *reinterpret_cast<const spdy::SpdySettingsControlFrame*>(frame));
       break;
     case RST_STREAM:
       visitor_->OnRstStream(
           *reinterpret_cast<const spdy::SpdyRstStreamControlFrame*>(frame));
       break;
     case spdy::WINDOW_UPDATE:
       visitor_->OnWindowUpdate(
           *reinterpret_cast<const spdy::SpdyWindowUpdateControlFrame*>(frame));
       break;
     default:
@@ skipping 65 matching lines @@
   frames_received_++;
   header_stream_id_ = frame->stream_id();
 }
 
 void BufferedSpdyFramer::OnStreamFrameData(SpdyStreamId stream_id,
                                            const char* data,
                                            size_t len) {
   visitor_->OnStreamFrameData(stream_id, data, len);
 }
 
+void BufferedSpdyFramer::OnSetting(SpdySettingsIds id,
+                                   uint8 flags,
+                                   uint32 value) {
+  visitor_->OnSetting(id, flags, value);
+}
+
 int BufferedSpdyFramer::protocol_version() {
   return spdy_framer_.protocol_version();
 }
 
 size_t BufferedSpdyFramer::ProcessInput(const char* data, size_t len) {
   return spdy_framer_.ProcessInput(data, len);
 }
 
 void BufferedSpdyFramer::Reset() {
   spdy_framer_.Reset();
 }
 
 SpdyFramer::SpdyError BufferedSpdyFramer::error_code() const {
   return spdy_framer_.error_code();
 }
 
 SpdyFramer::SpdyState BufferedSpdyFramer::state() const {
   return spdy_framer_.state();
 }
 
 bool BufferedSpdyFramer::MessageFullyRead() {
   return spdy_framer_.MessageFullyRead();
 }
 
 bool BufferedSpdyFramer::HasError() {
   return spdy_framer_.HasError();
 }
 
-bool BufferedSpdyFramer::ParseHeaderBlock(const SpdyFrame* frame,
-                                          SpdyHeaderBlock* block) {
-  return spdy_framer_.ParseHeaderBlock(frame, block);
-}
-
 SpdySynStreamControlFrame* BufferedSpdyFramer::CreateSynStream(
     SpdyStreamId stream_id,
     SpdyStreamId associated_stream_id,
     int priority,
     SpdyControlFlags flags,
     bool compressed,
     const SpdyHeaderBlock* headers) {
   return spdy_framer_.CreateSynStream(
       stream_id, associated_stream_id, priority, flags, compressed, headers);
 }
@@ skipping 46 matching lines @@
   return spdy_framer_.CreateCredentialFrame(credential);
 }
 
 SpdyDataFrame* BufferedSpdyFramer::CreateDataFrame(SpdyStreamId stream_id,
                                                    const char* data,
                                                    uint32 len,
                                                    SpdyDataFlags flags) {
   return spdy_framer_.CreateDataFrame(stream_id, data, len, flags);
 }
 
+SpdyPriority BufferedSpdyFramer::GetHighestPriority() const {
+  return spdy_framer_.GetHighestPriority();
+}
+
 SpdyFrame* BufferedSpdyFramer::CompressFrame(const SpdyFrame& frame) {
   return spdy_framer_.CompressFrame(frame);
 }
 
 bool BufferedSpdyFramer::IsCompressible(const SpdyFrame& frame) const {
   return spdy_framer_.IsCompressible(frame);
 }
 
 void BufferedSpdyFramer::InitHeaderStreaming(const SpdyControlFrame* frame) {
   memset(header_buffer_, 0, kHeaderBufferSize);
@@ skipping 16 matching lines @@
     default:
       DCHECK(false);  // Error!
       break;
   }
   control_frame_.reset(new SpdyFrame(frame_size_without_header_block));
   memcpy(control_frame_.get()->data(), frame->data(),
          frame_size_without_header_block);
 }
 
 }  // namespace spdy