Index: net/spdy/spdy_framer.h |
diff --git a/net/spdy/spdy_framer.h b/net/spdy/spdy_framer.h |
index 9627c8facff530900970a5a1f60e40b6f81f554f..0bc9f5365d89536ad62772778b4528e806733aed 100644 |
--- a/net/spdy/spdy_framer.h |
+++ b/net/spdy/spdy_framer.h |
@@ -16,6 +16,8 @@ |
#include "base/memory/scoped_ptr.h" |
#include "base/sys_byteorder.h" |
#include "net/base/net_export.h" |
+#include "net/spdy/http2_compressor.h" |
+#include "net/spdy/http2_decompressor.h" |
#include "net/spdy/spdy_header_block.h" |
#include "net/spdy/spdy_protocol.h" |
@@ -589,8 +591,13 @@ class NET_EXPORT_PRIVATE SpdyFramer { |
size_t GetSerializedLength(const SpdyHeaderBlock& headers); |
// Get (and lazily initialize) the ZLib state. |
- z_stream* GetHeaderCompressor(); |
- z_stream* GetHeaderDecompressor(); |
+ z_stream* GetSpdyHeaderCompressor(); |
+ z_stream* GetSpdyHeaderDecompressor(); |
+ |
+ // Get (and lazily initialize) the HTTP/2 compression/decompression |
+ // state. |
+ Http2Compressor* GetHttp2HeaderCompressor(); |
+ Http2Decompressor* GetHttp2HeaderDecompressor(); |
private: |
// Deliver the given control frame's uncompressed headers block to the |
@@ -682,8 +689,11 @@ class NET_EXPORT_PRIVATE SpdyFramer { |
bool enable_compression_; // Controls all compression |
// SPDY header compressors. |
- scoped_ptr<z_stream> header_compressor_; |
- scoped_ptr<z_stream> header_decompressor_; |
+ scoped_ptr<z_stream> spdy_header_compressor_; |
+ scoped_ptr<z_stream> spdy_header_decompressor_; |
+ // HTTP/2 header compressors. |
+ scoped_ptr<Http2Compressor> http2_header_compressor_; |
+ scoped_ptr<Http2Decompressor> http2_header_decompressor_; |
SpdyFramerVisitorInterface* visitor_; |
SpdyFramerDebugVisitorInterface* debug_visitor_; |