summaryrefslogtreecommitdiffstats
path: root/net/spdy/spdy_test_util_common.cc
diff options
context:
space:
mode:
authorjgraettinger@chromium.org <jgraettinger@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-25 05:42:05 +0000
committerjgraettinger@chromium.org <jgraettinger@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-25 05:42:05 +0000
commit53669f6067d653bd701a145e0bde26edfa074605 (patch)
tree6e0cb51106b8ee6a1a421ac24f51794474527b07 /net/spdy/spdy_test_util_common.cc
parent1214b853e84214f7e908a61272eefebe82b7303d (diff)
downloadchromium_src-53669f6067d653bd701a145e0bde26edfa074605.zip
chromium_src-53669f6067d653bd701a145e0bde26edfa074605.tar.gz
chromium_src-53669f6067d653bd701a145e0bde26edfa074605.tar.bz2
Implements the ACK flag for SPDY4/HTTP2 PING frames
This lands server change 61378132 by birenroy. Also update SpdySession, BufferedSpdyFramer, etc to accept and pass the |is_ack| flag. BUG=345769 Review URL: https://codereview.chromium.org/169283012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@253088 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/spdy/spdy_test_util_common.cc')
-rw-r--r--net/spdy/spdy_test_util_common.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/net/spdy/spdy_test_util_common.cc b/net/spdy/spdy_test_util_common.cc
index b68759b..66a6f8c3 100644
--- a/net/spdy/spdy_test_util_common.cc
+++ b/net/spdy/spdy_test_util_common.cc
@@ -237,7 +237,7 @@ class PriorityGetter : public BufferedSpdyFramerVisitorInterface {
virtual void OnSettings(bool clear_persisted) OVERRIDE {}
virtual void OnSetting(
SpdySettingsIds id, uint8 flags, uint32 value) OVERRIDE {}
- virtual void OnPing(SpdyPingId unique_id) OVERRIDE {}
+ virtual void OnPing(SpdyPingId unique_id, bool is_ack) OVERRIDE {}
virtual void OnRstStream(SpdyStreamId stream_id,
SpdyRstStreamStatus status) OVERRIDE {}
virtual void OnGoAway(SpdyStreamId last_accepted_stream_id,
@@ -868,8 +868,9 @@ SpdyFrame* SpdyTestUtil::ConstructSpdySettings(
return CreateFramer()->SerializeSettings(settings_ir);
}
-SpdyFrame* SpdyTestUtil::ConstructSpdyPing(uint32 ping_id) const {
+SpdyFrame* SpdyTestUtil::ConstructSpdyPing(uint32 ping_id, bool is_ack) const {
SpdyPingIR ping_ir(ping_id);
+ ping_ir.set_is_ack(is_ack);
return CreateFramer()->SerializePing(ping_ir);
}