diff options
author | jgraettinger@chromium.org <jgraettinger@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-12 19:03:55 +0000 |
---|---|---|
committer | jgraettinger@chromium.org <jgraettinger@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-12 19:03:55 +0000 |
commit | bd254d51c03c91f8a42113766d071834be3f8d08 (patch) | |
tree | 52c06f54be693a7276bf96db85e30da9ea7993d7 /net/quic | |
parent | ccb820241f34c1a1f7a8eefcb7b20cd87b877c8d (diff) | |
download | chromium_src-bd254d51c03c91f8a42113766d071834be3f8d08.zip chromium_src-bd254d51c03c91f8a42113766d071834be3f8d08.tar.gz chromium_src-bd254d51c03c91f8a42113766d071834be3f8d08.tar.bz2 |
Changes the type for PING id from uint32 to uint64.
Required for HTTP2.
This lands server change 60786018 by birenroy.
Minor type updates to QUIC/SpdySession & friends were also required.
Review URL: https://codereview.chromium.org/154353003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@250767 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/quic')
-rw-r--r-- | net/quic/quic_headers_stream.cc | 2 | ||||
-rw-r--r-- | net/quic/quic_headers_stream_test.cc | 2 | ||||
-rw-r--r-- | net/quic/quic_spdy_decompressor.cc | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/net/quic/quic_headers_stream.cc b/net/quic/quic_headers_stream.cc index a031e9e..41e6f7a 100644 --- a/net/quic/quic_headers_stream.cc +++ b/net/quic/quic_headers_stream.cc @@ -101,7 +101,7 @@ class QuicHeadersStream::SpdyFramerVisitor CloseConnection("SPDY SETTINGS frame recevied."); } - virtual void OnPing(uint32 unique_id) OVERRIDE { + virtual void OnPing(SpdyPingId unique_id) OVERRIDE { CloseConnection("SPDY PING frame recevied."); } diff --git a/net/quic/quic_headers_stream_test.cc b/net/quic/quic_headers_stream_test.cc index 2d5a6a1..4d97a7a 100644 --- a/net/quic/quic_headers_stream_test.cc +++ b/net/quic/quic_headers_stream_test.cc @@ -47,7 +47,7 @@ class MockVisitor : public SpdyFramerVisitorInterface { SpdyRstStreamStatus status)); MOCK_METHOD1(OnSettings, void(bool clear_persisted)); MOCK_METHOD3(OnSetting, void(SpdySettingsIds id, uint8 flags, uint32 value)); - MOCK_METHOD1(OnPing, void(uint32 unique_id)); + MOCK_METHOD1(OnPing, void(SpdyPingId unique_id)); MOCK_METHOD2(OnGoAway, void(SpdyStreamId last_accepted_stream_id, SpdyGoAwayStatus status)); MOCK_METHOD2(OnHeaders, void(SpdyStreamId stream_id, bool fin)); diff --git a/net/quic/quic_spdy_decompressor.cc b/net/quic/quic_spdy_decompressor.cc index 74ac54f..fb899ca 100644 --- a/net/quic/quic_spdy_decompressor.cc +++ b/net/quic/quic_spdy_decompressor.cc @@ -44,7 +44,7 @@ class SpdyFramerVisitor : public SpdyFramerVisitorInterface { virtual void OnSetting(SpdySettingsIds id, uint8 flags, uint32 value) OVERRIDE {} - virtual void OnPing(uint32 unique_id) OVERRIDE {} + virtual void OnPing(SpdyPingId unique_id) OVERRIDE {} virtual void OnGoAway(SpdyStreamId last_accepted_stream_id, SpdyGoAwayStatus status) OVERRIDE {} virtual void OnHeaders(SpdyStreamId stream_id, bool fin) OVERRIDE {} |