diff options
| author | jgraettinger@chromium.org <jgraettinger@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-02 01:21:36 +0000 |
|---|---|---|
| committer | jgraettinger@chromium.org <jgraettinger@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-02 01:21:36 +0000 |
| commit | 9e04fe63a65381f35b40902719e7d6c776c2de90 (patch) | |
| tree | 058c1c3b5130a2c57827199313982e32dad58c83 /net | |
| parent | d0a4bdb1d2bbfc79ebf3107735044df44228a5fe (diff) | |
| download | chromium_src-9e04fe63a65381f35b40902719e7d6c776c2de90.zip chromium_src-9e04fe63a65381f35b40902719e7d6c776c2de90.tar.gz chromium_src-9e04fe63a65381f35b40902719e7d6c776c2de90.tar.bz2 | |
Backout SpdySettingsID implicit renumbering.
Renumbering was introduced in https://codereview.chromium.org/202383002/
SpdyConstants (added in that CL) is now responsible for mapping settings
to protocol-specific wire values. SpdySettingsIds was absolved of
responsibility for capturing wire settings ID's, and the removal of
explicit enum values was cosmetic.
However it's interacting poorly with settings persistence, which is caching
setting ID's keyed on the enumeration values. So back it out.
BUG=358677
Review URL: https://codereview.chromium.org/221173004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@261021 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
| -rw-r--r-- | net/spdy/spdy_protocol.h | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/net/spdy/spdy_protocol.h b/net/spdy/spdy_protocol.h index 499f84e..b5cabfa 100644 --- a/net/spdy/spdy_protocol.h +++ b/net/spdy/spdy_protocol.h @@ -334,24 +334,25 @@ enum SpdySettingsFlags { SETTINGS_FLAG_PERSISTED = 0x2 }; -// List of known settings. +// List of known settings. Avoid changing these enum values, as persisted +// settings are keyed on them, and they are also exposed in net-internals. enum SpdySettingsIds { - SETTINGS_UPLOAD_BANDWIDTH, - SETTINGS_DOWNLOAD_BANDWIDTH, + SETTINGS_UPLOAD_BANDWIDTH = 0x1, + SETTINGS_DOWNLOAD_BANDWIDTH = 0x2, // Network round trip time in milliseconds. - SETTINGS_ROUND_TRIP_TIME, + SETTINGS_ROUND_TRIP_TIME = 0x3, // The maximum number of simultaneous live streams in each direction. - SETTINGS_MAX_CONCURRENT_STREAMS, + SETTINGS_MAX_CONCURRENT_STREAMS = 0x4, // TCP congestion window in packets. - SETTINGS_CURRENT_CWND, + SETTINGS_CURRENT_CWND = 0x5, // Downstream byte retransmission rate in percentage. - SETTINGS_DOWNLOAD_RETRANS_RATE, + SETTINGS_DOWNLOAD_RETRANS_RATE = 0x6, // Initial window size in bytes - SETTINGS_INITIAL_WINDOW_SIZE, + SETTINGS_INITIAL_WINDOW_SIZE = 0x7, // HPACK header table maximum size. - SETTINGS_HEADER_TABLE_SIZE, + SETTINGS_HEADER_TABLE_SIZE = 0x8, // Whether or not server push (PUSH_PROMISE) is enabled. - SETTINGS_ENABLE_PUSH, + SETTINGS_ENABLE_PUSH = 0x9, }; // Status codes for RST_STREAM frames. |