summaryrefslogtreecommitdiffstats
path: root/net/tools
diff options
context:
space:
mode:
authorakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-15 17:56:57 +0000
committerakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-15 17:56:57 +0000
commit4e974359395d6d9851a334eb6cdbf125d88b060e (patch)
tree9621dc36276ab4db3f7a663d6cc232afccc20378 /net/tools
parentef34dfb045fe305c5d8bb2d6cdb5b632b80086e3 (diff)
downloadchromium_src-4e974359395d6d9851a334eb6cdbf125d88b060e.zip
chromium_src-4e974359395d6d9851a334eb6cdbf125d88b060e.tar.gz
chromium_src-4e974359395d6d9851a334eb6cdbf125d88b060e.tar.bz2
Serious cleanup of SpdyFramer compression code:
* Move the compression logic into SerializeNameValueBlock. * Get rid of accessory methods like 'IsCompressible' and 'CompressControlFrame'. * Get us a few steps closer to removing SpdyControlFrame. * Add some logic to SpdyFrameBuilder to be able to build test frames more easily. * Remove need for 'compressed' argument in CreateSynStream, CreateSynReply and CreateHeaders. The argument has been left in with a DCHECK ensuring correct behavior in order to illustrate that zero behavioral change has been made. It will be removed in a follow-up CL. * Lots of other cleanup. Zero change to on-the-wire results and behavior. This lands server change 42232412. Also replaces OnControlFrameCompressed with OnSynStreamCompressed. Also maintains Chrome-specific behavior, like USE_SYSTEM_ZLIB switching and the CRIME fixes in r151720. Also pass through enable_compression_ flag in SpdySession. BUG=139744 Review URL: https://codereview.chromium.org/12263029 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@182753 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/tools')
-rw-r--r--net/tools/flip_server/spdy_interface.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/net/tools/flip_server/spdy_interface.h b/net/tools/flip_server/spdy_interface.h
index a6c725d..e979f9a 100644
--- a/net/tools/flip_server/spdy_interface.h
+++ b/net/tools/flip_server/spdy_interface.h
@@ -94,10 +94,10 @@ class SpdySM : public BufferedSpdyFramerVisitorInterface,
// and validated.
virtual void OnSetting(SpdySettingsIds id,
uint8 flags,
- uint32 value) OVERRIDE {};
+ uint32 value) OVERRIDE {}
// Called when a PING frame has been parsed.
- virtual void OnPing(uint32 unique_id) OVERRIDE {};
+ virtual void OnPing(uint32 unique_id) OVERRIDE {}
// Called when a RST_STREAM frame has been parsed.
virtual void OnRstStream(SpdyStreamId stream_id,
@@ -105,17 +105,17 @@ class SpdySM : public BufferedSpdyFramerVisitorInterface,
// Called when a GOAWAY frame has been parsed.
virtual void OnGoAway(SpdyStreamId last_accepted_stream_id,
- SpdyGoAwayStatus status) OVERRIDE {};
+ SpdyGoAwayStatus status) OVERRIDE {}
// Called when a WINDOW_UPDATE frame has been parsed.
virtual void OnWindowUpdate(SpdyStreamId stream_id,
- int delta_window_size) OVERRIDE {};
+ int delta_window_size) OVERRIDE {}
// Called after a control frame has been compressed to allow the visitor
// to record compression statistics.
- virtual void OnControlFrameCompressed(
- const SpdyControlFrame& uncompressed_frame,
- const SpdyControlFrame& compressed_frame) OVERRIDE {};
+ virtual void OnSynStreamCompressed(
+ size_t uncompressed_size,
+ size_t compressed_size) OVERRIDE {}
public:
virtual size_t ProcessReadInput(const char* data, size_t len) OVERRIDE;