SPDY - integration of spdy/3 code.

net/spdy/buffered_spdy_framer.h

 // 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.
 
 #ifndef NET_SPDY_BUFFERED_SPDY_FRAMER_H_
 #define NET_SPDY_BUFFERED_SPDY_FRAMER_H_
 #pragma once
 
 #include <string>
 
@@ skipping 33 matching lines @@
 
   // Called after a RST_STREAM frame is received.
   virtual void OnRstStream(const spdy::SpdyRstStreamControlFrame& frame) = 0;
 
   // Called after a GOAWAY frame is received.
   virtual void OnGoAway(const spdy::SpdyGoAwayControlFrame& frame) = 0;
 
   // Called after a PING frame is received.
   virtual void OnPing(const spdy::SpdyPingControlFrame& frame) = 0;
 
-  // Called after a SETTINGS frame is received.
-  virtual void OnSettings(const spdy::SpdySettingsControlFrame& frame) = 0;
-
   // Called after a WINDOW_UPDATE frame is received.
   virtual void OnWindowUpdate(
       const spdy::SpdyWindowUpdateControlFrame& frame) = 0;
 
   // Called when data is received.
   // |stream_id| The stream receiving data.
   // |data| A buffer containing the data received.
   // |len| The length of the data buffer.
   // When the other side has finished sending data on this stream,
   // this method will be called with a zero-length buffer.
   virtual void OnStreamFrameData(SpdyStreamId stream_id,
                                  const char* data,
                                  size_t len) = 0;
+  virtual void OnSetting(SpdySettingsIds id, uint8 flags, uint32 value) = 0;

[Ryan Hamilton, 2012/03/09 19:09:58]

Please add a comment.

[ramant (doing other things), 2012/03/10 01:14:09]

Done.

 
  private:
   DISALLOW_COPY_AND_ASSIGN(BufferedSpdyFramerVisitorInterface);
 };
 
 class NET_EXPORT_PRIVATE BufferedSpdyFramer
     : public SpdyFramerVisitorInterface {
  public:
   explicit BufferedSpdyFramer(int version);
   virtual ~BufferedSpdyFramer();
 
   // Sets callbacks to be called from the buffered spdy framer.  A visitor must
   // be set, or else the framer will likely crash.  It is acceptable for the
   // visitor to do nothing.  If this is called multiple times, only the last
   // visitor will be used.
   void set_visitor(BufferedSpdyFramerVisitorInterface* visitor);
 
   // SpdyFramerVisitorInterface
   virtual void OnError(spdy::SpdyFramer* spdy_framer) OVERRIDE;
   virtual void OnControl(const SpdyControlFrame* frame) OVERRIDE;
   virtual bool OnCredentialFrameData(const char* frame_data,
                                      size_t len) OVERRIDE;
   virtual bool OnControlFrameHeaderData(SpdyStreamId stream_id,
                                         const char* header_data,
                                         size_t len) OVERRIDE;
   virtual void OnStreamFrameData(SpdyStreamId stream_id,
                                  const char* data,
                                  size_t len) OVERRIDE;
+  virtual void OnSetting(
+      SpdySettingsIds id, uint8 flags, uint32 value) OVERRIDE;
   virtual void OnDataFrameHeader(const SpdyDataFrame* frame) OVERRIDE;
 
   // SpdyFramer methods.
   size_t ProcessInput(const char* data, size_t len);
   int protocol_version();
   void Reset();
   SpdyFramer::SpdyError error_code() const;
   SpdyFramer::SpdyState state() const;
   bool MessageFullyRead();
   bool HasError();
-  bool ParseHeaderBlock(const SpdyFrame* frame, SpdyHeaderBlock* block);
   SpdySynStreamControlFrame* CreateSynStream(SpdyStreamId stream_id,
                                              SpdyStreamId associated_stream_id,
                                              int priority,
                                              SpdyControlFlags flags,
                                              bool compressed,
                                              const SpdyHeaderBlock* headers);
   SpdySynReplyControlFrame* CreateSynReply(SpdyStreamId stream_id,
                                            SpdyControlFlags flags,
                                            bool compressed,
                                            const SpdyHeaderBlock* headers);
   SpdyRstStreamControlFrame* CreateRstStream(SpdyStreamId stream_id,
                                              SpdyStatusCodes status) const;
   SpdySettingsControlFrame* CreateSettings(const SpdySettings& values) const;
   SpdyPingControlFrame* CreatePingFrame(uint32 unique_id) const;
   SpdyGoAwayControlFrame* CreateGoAway(
       SpdyStreamId last_accepted_stream_id) const;
   SpdyHeadersControlFrame* CreateHeaders(SpdyStreamId stream_id,
                                          SpdyControlFlags flags,
                                          bool compressed,
                                          const SpdyHeaderBlock* headers);
   SpdyWindowUpdateControlFrame* CreateWindowUpdate(
       SpdyStreamId stream_id,
       uint32 delta_window_size) const;
   SpdyCredentialControlFrame* CreateCredentialFrame(
       const spdy::SpdyCredential& credential) const;
   SpdyDataFrame* CreateDataFrame(SpdyStreamId stream_id,
                                  const char* data,
                                  uint32 len,
                                  SpdyDataFlags flags);
+  SpdyPriority GetHighestPriority() const;

[Ryan Hamilton, 2012/03/09 19:09:58]

Hm.  This seems fine, but I wonder why we don't have other similar methods? 

[ramant (doing other things), 2012/03/10 01:14:09]

Agreed.

   SpdyFrame* CompressFrame(const SpdyFrame& frame);
   bool IsCompressible(const SpdyFrame& frame) const;
 
   int frames_received() const { return frames_received_; }
 
  private:
   // The size of the header_buffer_.
   enum { kHeaderBufferSize = 32 * 1024 };
 
   void InitHeaderStreaming(const SpdyControlFrame* frame);
 
   SpdyFramer spdy_framer_;
   BufferedSpdyFramerVisitorInterface* visitor_;
 
   // Header block streaming state:
   char header_buffer_[kHeaderBufferSize];
   size_t header_buffer_used_;
   bool header_buffer_valid_;
   SpdyStreamId header_stream_id_;
   scoped_ptr<SpdyFrame> control_frame_;
   int frames_received_;
 
   DISALLOW_COPY_AND_ASSIGN(BufferedSpdyFramer);
 };
 
 }  // namespace spdy
 
 #endif  // NET_SPDY_BUFFERED_SPDY_FRAMER_H_