| Index: net/spdy/spdy_protocol.h
|
| diff --git a/net/spdy/spdy_protocol.h b/net/spdy/spdy_protocol.h
|
| index 2d7395ae856d69afe194d31f04ce4cfd4263da26..61e86f96a0009de3e9972720b7615c349b7d0ddd 100644
|
| --- a/net/spdy/spdy_protocol.h
|
| +++ b/net/spdy/spdy_protocol.h
|
| @@ -296,44 +296,49 @@ enum SpdyDataFlags {
|
| DATA_FLAG_NONE = 0x00,
|
| DATA_FLAG_FIN = 0x01,
|
| DATA_FLAG_END_SEGMENT = 0x02,
|
| - DATA_FLAG_PAD_LOW = 0x10,
|
| - DATA_FLAG_PAD_HIGH = 0x20
|
| + DATA_FLAG_PAD_LOW = 0x08,
|
| + DATA_FLAG_PAD_HIGH = 0x10,
|
| + DATA_FLAG_COMPRESSED = 0x20,
|
| };
|
|
|
| // Flags on control packets
|
| enum SpdyControlFlags {
|
| - CONTROL_FLAG_NONE = 0,
|
| - CONTROL_FLAG_FIN = 1,
|
| - CONTROL_FLAG_UNIDIRECTIONAL = 2
|
| + CONTROL_FLAG_NONE = 0x00,
|
| + CONTROL_FLAG_FIN = 0x01,
|
| + CONTROL_FLAG_UNIDIRECTIONAL = 0x02,
|
| };
|
|
|
| enum SpdyPingFlags {
|
| - PING_FLAG_ACK = 0x1,
|
| + PING_FLAG_ACK = 0x01,
|
| };
|
|
|
| +// Used by HEADERS, PUSH_PROMISE, and CONTINUATION.
|
| enum SpdyHeadersFlags {
|
| - HEADERS_FLAG_END_HEADERS = 0x4,
|
| - HEADERS_FLAG_PRIORITY = 0x8
|
| + HEADERS_FLAG_END_SEGMENT = 0x02,
|
| + HEADERS_FLAG_END_HEADERS = 0x04,
|
| + HEADERS_FLAG_PAD_LOW = 0x08,
|
| + HEADERS_FLAG_PAD_HIGH = 0x10,
|
| + HEADERS_FLAG_PRIORITY = 0x20,
|
| };
|
|
|
| enum SpdyPushPromiseFlags {
|
| - PUSH_PROMISE_FLAG_END_PUSH_PROMISE = 0x4
|
| + PUSH_PROMISE_FLAG_END_PUSH_PROMISE = 0x04,
|
| };
|
|
|
| // Flags on the SETTINGS control frame.
|
| enum SpdySettingsControlFlags {
|
| - SETTINGS_FLAG_CLEAR_PREVIOUSLY_PERSISTED_SETTINGS = 0x1
|
| + SETTINGS_FLAG_CLEAR_PREVIOUSLY_PERSISTED_SETTINGS = 0x01,
|
| };
|
|
|
| enum Http2SettingsControlFlags {
|
| - SETTINGS_FLAG_ACK = 0x1,
|
| + SETTINGS_FLAG_ACK = 0x01,
|
| };
|
|
|
| // Flags for settings within a SETTINGS frame.
|
| enum SpdySettingsFlags {
|
| - SETTINGS_FLAG_NONE = 0x0,
|
| - SETTINGS_FLAG_PLEASE_PERSIST = 0x1,
|
| - SETTINGS_FLAG_PERSISTED = 0x2
|
| + SETTINGS_FLAG_NONE = 0x00,
|
| + SETTINGS_FLAG_PLEASE_PERSIST = 0x01,
|
| + SETTINGS_FLAG_PERSISTED = 0x02,
|
| };
|
|
|
| // List of known settings. Avoid changing these enum values, as persisted
|
|
|