| Index: net/spdy/spdy_framer.h
|
| diff --git a/net/spdy/spdy_framer.h b/net/spdy/spdy_framer.h
|
| index 2da3b7ed5ceb2be14df34bf617195ab3cdd44a60..be99a832cae7a1d25cab02ab74198e1a3011e614 100644
|
| --- a/net/spdy/spdy_framer.h
|
| +++ b/net/spdy/spdy_framer.h
|
| @@ -307,8 +307,7 @@ class NET_EXPORT_PRIVATE SpdyFramer {
|
| SPDY_INVALID_DATA_FRAME_FLAGS, // Data frame has invalid flags.
|
| SPDY_INVALID_CONTROL_FRAME_FLAGS, // Control frame has invalid flags.
|
| SPDY_UNEXPECTED_FRAME, // Frame received out of order.
|
| -
|
| - LAST_ERROR, // Must be the last entry in the enum.
|
| + LAST_ERROR, // Must be the last entry in the enum.
|
| };
|
|
|
| // Constant for invalid (or unknown) stream IDs.
|
| @@ -326,9 +325,8 @@ class NET_EXPORT_PRIVATE SpdyFramer {
|
|
|
| // Retrieve serialized length of SpdyHeaderBlock.
|
| // TODO(hkhalil): Remove, or move to quic code.
|
| - static size_t GetSerializedLength(
|
| - const SpdyMajorVersion spdy_version,
|
| - const SpdyHeaderBlock* headers);
|
| + static size_t GetSerializedLength(const SpdyMajorVersion spdy_version,
|
| + const SpdyHeaderBlock* headers);
|
|
|
| // Create a new Framer, provided a SPDY version.
|
| explicit SpdyFramer(SpdyMajorVersion version);
|
| @@ -338,9 +336,7 @@ class NET_EXPORT_PRIVATE SpdyFramer {
|
| // 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(SpdyFramerVisitorInterface* visitor) {
|
| - visitor_ = visitor;
|
| - }
|
| + void set_visitor(SpdyFramerVisitorInterface* visitor) { visitor_ = visitor; }
|
|
|
| // Set debug callbacks to be called from the framer. The debug visitor is
|
| // completely optional and need not be set in order for normal operation.
|
| @@ -368,8 +364,8 @@ class NET_EXPORT_PRIVATE SpdyFramer {
|
| // in the given header block.
|
| // Returns number of bytes consumed if successfully parsed, 0 otherwise.
|
| size_t ParseHeaderBlockInBuffer(const char* header_data,
|
| - size_t header_length,
|
| - SpdyHeaderBlock* block) const;
|
| + size_t header_length,
|
| + SpdyHeaderBlock* block) const;
|
|
|
| // Serialize a data frame.
|
| SpdySerializedFrame* SerializeData(const SpdyDataIR& data) const;
|
| @@ -453,9 +449,7 @@ class NET_EXPORT_PRIVATE SpdyFramer {
|
| SpdyFrame* CompressFrame(const SpdyFrame& frame);
|
|
|
| // For ease of testing and experimentation we can tweak compression on/off.
|
| - void set_enable_compression(bool value) {
|
| - enable_compression_ = value;
|
| - }
|
| + void set_enable_compression(bool value) { enable_compression_ = value; }
|
|
|
| // Used only in log messages.
|
| void set_display_protocol(const std::string& protocol) {
|
| @@ -513,10 +507,9 @@ class NET_EXPORT_PRIVATE SpdyFramer {
|
| // Deliver the given control frame's compressed headers block to the visitor
|
| // in decompressed form, in chunks. Returns true if the visitor has
|
| // accepted all of the chunks.
|
| - bool IncrementallyDecompressControlFrameHeaderData(
|
| - SpdyStreamId stream_id,
|
| - const char* data,
|
| - size_t len);
|
| + bool IncrementallyDecompressControlFrameHeaderData(SpdyStreamId stream_id,
|
| + const char* data,
|
| + size_t len);
|
|
|
| protected:
|
| // TODO(jgraettinger): Switch to test peer pattern.
|
| @@ -532,8 +525,7 @@ class NET_EXPORT_PRIVATE SpdyFramer {
|
| FRIEND_TEST_ALL_PREFIXES(SpdyFramerTest,
|
| UncompressLargerThanFrameBufferInitialSize);
|
| FRIEND_TEST_ALL_PREFIXES(SpdyFramerTest, ReadLargeSettingsFrame);
|
| - FRIEND_TEST_ALL_PREFIXES(SpdyFramerTest,
|
| - ReadLargeSettingsFrameInSmallChunks);
|
| + FRIEND_TEST_ALL_PREFIXES(SpdyFramerTest, ReadLargeSettingsFrameInSmallChunks);
|
| FRIEND_TEST_ALL_PREFIXES(SpdyFramerTest, ControlFrameAtMaxSizeLimit);
|
| FRIEND_TEST_ALL_PREFIXES(SpdyFramerTest, ControlFrameTooLarge);
|
| FRIEND_TEST_ALL_PREFIXES(SpdyFramerTest,
|
| @@ -613,20 +605,19 @@ class NET_EXPORT_PRIVATE SpdyFramer {
|
| // read, and:
|
| // *data is advanced the number of bytes read.
|
| // *len is reduced by the number of bytes read.
|
| - size_t UpdateCurrentFrameBuffer(const char** data, size_t* len,
|
| + size_t UpdateCurrentFrameBuffer(const char** data,
|
| + size_t* len,
|
| size_t max_bytes);
|
|
|
| - void WriteHeaderBlockToZ(const SpdyHeaderBlock* headers,
|
| - z_stream* out) const;
|
| + void WriteHeaderBlockToZ(const SpdyHeaderBlock* headers, z_stream* out) const;
|
|
|
| void SerializeNameValueBlockWithoutCompression(
|
| SpdyFrameBuilder* builder,
|
| const SpdyNameValueBlock& name_value_block) const;
|
|
|
| // Compresses automatically according to enable_compression_.
|
| - void SerializeNameValueBlock(
|
| - SpdyFrameBuilder* builder,
|
| - const SpdyFrameWithNameValueBlockIR& frame);
|
| + void SerializeNameValueBlock(SpdyFrameBuilder* builder,
|
| + const SpdyFrameWithNameValueBlockIR& frame);
|
|
|
| // Set the error code and moves the framer into the error state.
|
| void set_error(SpdyError error);
|
| @@ -646,7 +637,7 @@ class NET_EXPORT_PRIVATE SpdyFramer {
|
| return 16 * 1024 * 1024;
|
| }
|
| // Absolute maximum size of HTTP2 frame payload (section 4.2 "Frame size").
|
| - return (1<<14) - 1;
|
| + return (1 << 14) - 1;
|
| }
|
|
|
| // The size of the control frame buffer.
|
|
|