Index: net/spdy/spdy_framer.h |
diff --git a/net/spdy/spdy_framer.h b/net/spdy/spdy_framer.h |
index 7ce2c850e50eac3e087ddf76ba182e00e7fb1372..cb7809328018d76c814e5f64119e82b0599a34fe 100644 |
--- a/net/spdy/spdy_framer.h |
+++ b/net/spdy/spdy_framer.h |
@@ -677,7 +677,6 @@ class NET_EXPORT_PRIVATE SpdyFramer { |
SpdyFrameType type, |
int padding_payload_len); |
- private: |
// Deliver the given control frame's uncompressed headers block to the |
// visitor in chunks. Returns true if the visitor has accepted all of the |
// chunks. |
@@ -745,15 +744,18 @@ class NET_EXPORT_PRIVATE SpdyFramer { |
// The type of the frame currently being read. |
SpdyFrameType current_frame_type_; |
- // The flags field of the frame currently being read. |
- uint8 current_frame_flags_; |
- |
// The total length of the frame currently being read, including frame header. |
uint32 current_frame_length_; |
// The stream ID field of the frame currently being read, if applicable. |
SpdyStreamId current_frame_stream_id_; |
+ // Set this to the current stream when we receive a HEADERS, PUSH_PROMISE, or |
+ // CONTINUATION frame without the END_HEADERS(0x4) bit set. These frames must |
+ // be followed by a CONTINUATION frame, or else we throw a PROTOCOL_ERROR. |
+ // A value of 0 indicates that we are not expecting a CONTINUATION frame. |
+ SpdyStreamId expect_continuation_; |
+ |
// Scratch space for handling SETTINGS frames. |
// TODO(hkhalil): Unify memory for this scratch space with |
// current_frame_buffer_. |
@@ -761,7 +763,6 @@ class NET_EXPORT_PRIVATE SpdyFramer { |
SpdyAltSvcScratch altsvc_scratch_; |
- bool enable_compression_; // Controls all compression |
// SPDY header compressors. |
scoped_ptr<z_stream> header_compressor_; |
scoped_ptr<z_stream> header_decompressor_; |
@@ -777,6 +778,12 @@ class NET_EXPORT_PRIVATE SpdyFramer { |
// The protocol version to be spoken/understood by this framer. |
const SpdyMajorVersion protocol_version_; |
+ // The flags field of the frame currently being read. |
+ uint8 current_frame_flags_; |
+ |
+ // Determines whether HPACK or gzip compression is used. |
+ bool enable_compression_; |
+ |
// Tracks if we've ever gotten far enough in framing to see a control frame of |
// type SYN_STREAM or SYN_REPLY. |
// |
@@ -792,12 +799,6 @@ class NET_EXPORT_PRIVATE SpdyFramer { |
// a lot more state. |
bool probable_http_response_; |
- // Set this to the current stream when we receive a HEADERS, PUSH_PROMISE, or |
- // CONTINUATION frame without the END_HEADERS(0x4) bit set. These frames must |
- // be followed by a CONTINUATION frame, or else we throw a PROTOCOL_ERROR. |
- // A value of 0 indicates that we are not expecting a CONTINUATION frame. |
- SpdyStreamId expect_continuation_; |
- |
// If a HEADERS frame is followed by a CONTINUATION frame, the FIN/END_STREAM |
// flag is still carried in the HEADERS frame. If it's set, flip this so that |
// we know to terminate the stream when the entire header block has been |