diff options
Diffstat (limited to 'chromium/net/spdy/buffered_spdy_framer.h')
| -rw-r--r-- | chromium/net/spdy/buffered_spdy_framer.h | 32 |
1 files changed, 21 insertions, 11 deletions
diff --git a/chromium/net/spdy/buffered_spdy_framer.h b/chromium/net/spdy/buffered_spdy_framer.h index 3e10561ba93..64aa0f786e0 100644 --- a/chromium/net/spdy/buffered_spdy_framer.h +++ b/chromium/net/spdy/buffered_spdy_framer.h @@ -38,7 +38,6 @@ class NET_EXPORT_PRIVATE BufferedSpdyFramerVisitorInterface { virtual void OnSynStream(SpdyStreamId stream_id, SpdyStreamId associated_stream_id, SpdyPriority priority, - uint8 credential_slot, bool fin, bool unidirectional, const SpdyHeaderBlock& headers) = 0; @@ -78,8 +77,14 @@ class NET_EXPORT_PRIVATE BufferedSpdyFramerVisitorInterface { // and validated. virtual void OnSetting(SpdySettingsIds id, uint8 flags, uint32 value) = 0; + // Called when a SETTINGS frame is received with the ACK flag set. + virtual void OnSettingsAck() {} + + // Called at the completion of parsing SETTINGS id and value tuples. + virtual void OnSettingsEnd() {}; + // Called when a PING frame has been parsed. - virtual void OnPing(uint32 unique_id) = 0; + virtual void OnPing(SpdyPingId unique_id, bool is_ack) = 0; // Called when a RST_STREAM frame has been parsed. virtual void OnRstStream(SpdyStreamId stream_id, @@ -95,7 +100,8 @@ class NET_EXPORT_PRIVATE BufferedSpdyFramerVisitorInterface { // Called when a PUSH_PROMISE frame has been parsed. virtual void OnPushPromise(SpdyStreamId stream_id, - SpdyStreamId promised_stream_id) = 0; + SpdyStreamId promised_stream_id, + const SpdyHeaderBlock& headers) = 0; protected: virtual ~BufferedSpdyFramerVisitorInterface() {} @@ -127,13 +133,10 @@ class NET_EXPORT_PRIVATE BufferedSpdyFramer virtual void OnSynStream(SpdyStreamId stream_id, SpdyStreamId associated_stream_id, SpdyPriority priority, - uint8 credential_slot, bool fin, bool unidirectional) OVERRIDE; virtual void OnSynReply(SpdyStreamId stream_id, bool fin) OVERRIDE; - virtual void OnHeaders(SpdyStreamId stream_id, bool fin) OVERRIDE; - virtual bool OnCredentialFrameData(const char* frame_data, - size_t len) OVERRIDE; + virtual void OnHeaders(SpdyStreamId stream_id, bool fin, bool end) OVERRIDE; virtual bool OnControlFrameHeaderData(SpdyStreamId stream_id, const char* header_data, size_t len) OVERRIDE; @@ -144,7 +147,9 @@ class NET_EXPORT_PRIVATE BufferedSpdyFramer virtual void OnSettings(bool clear_persisted) OVERRIDE; virtual void OnSetting( SpdySettingsIds id, uint8 flags, uint32 value) OVERRIDE; - virtual void OnPing(uint32 unique_id) OVERRIDE; + virtual void OnSettingsAck() OVERRIDE; + virtual void OnSettingsEnd() OVERRIDE; + virtual void OnPing(SpdyPingId unique_id, bool is_ack) OVERRIDE; virtual void OnRstStream(SpdyStreamId stream_id, SpdyRstStreamStatus status) OVERRIDE; virtual void OnGoAway(SpdyStreamId last_accepted_stream_id, @@ -152,10 +157,12 @@ class NET_EXPORT_PRIVATE BufferedSpdyFramer virtual void OnWindowUpdate(SpdyStreamId stream_id, uint32 delta_window_size) OVERRIDE; virtual void OnPushPromise(SpdyStreamId stream_id, - SpdyStreamId promised_stream_id) OVERRIDE; + SpdyStreamId promised_stream_id, + bool end) OVERRIDE; virtual void OnDataFrameHeader(SpdyStreamId stream_id, size_t length, bool fin) OVERRIDE; + virtual void OnContinuation(SpdyStreamId stream_id, bool end) OVERRIDE; // SpdyFramer methods. size_t ProcessInput(const char* data, size_t len); @@ -168,7 +175,6 @@ class NET_EXPORT_PRIVATE BufferedSpdyFramer SpdyFrame* CreateSynStream(SpdyStreamId stream_id, SpdyStreamId associated_stream_id, SpdyPriority priority, - uint8 credential_slot, SpdyControlFlags flags, const SpdyHeaderBlock* headers); SpdyFrame* CreateSynReply(SpdyStreamId stream_id, @@ -177,7 +183,7 @@ class NET_EXPORT_PRIVATE BufferedSpdyFramer SpdyFrame* CreateRstStream(SpdyStreamId stream_id, SpdyRstStreamStatus status) const; SpdyFrame* CreateSettings(const SettingsMap& values) const; - SpdyFrame* CreatePingFrame(uint32 unique_id) const; + SpdyFrame* CreatePingFrame(uint32 unique_id, bool is_ack) const; SpdyFrame* CreateGoAway( SpdyStreamId last_accepted_stream_id, SpdyGoAwayStatus status) const; @@ -191,6 +197,9 @@ class NET_EXPORT_PRIVATE BufferedSpdyFramer const char* data, uint32 len, SpdyDataFlags flags); + SpdyFrame* CreatePushPromise(SpdyStreamId stream_id, + SpdyStreamId promised_stream_id, + const SpdyHeaderBlock* headers); // Serialize a frame of unknown type. SpdySerializedFrame* SerializeFrame(const SpdyFrameIR& frame) { @@ -247,6 +256,7 @@ class NET_EXPORT_PRIVATE BufferedSpdyFramer SpdyFrameType type; SpdyStreamId stream_id; SpdyStreamId associated_stream_id; + SpdyStreamId promised_stream_id; SpdyPriority priority; uint8 credential_slot; bool fin; |