Index: net/spdy/buffered_spdy_framer.cc |
diff --git a/net/spdy/buffered_spdy_framer.cc b/net/spdy/buffered_spdy_framer.cc |
index bafb5ce17cc42a1c2b639ed20702c6d1be84130f..93862eabde291de19b0899165f073e5e351c94bf 100644 |
--- a/net/spdy/buffered_spdy_framer.cc |
+++ b/net/spdy/buffered_spdy_framer.cc |
@@ -6,22 +6,17 @@ |
#include "base/logging.h" |
-namespace { |
- |
-bool g_enable_compression_default = true; |
- |
-} // namespace |
- |
namespace net { |
-BufferedSpdyFramer::BufferedSpdyFramer(int version) |
+BufferedSpdyFramer::BufferedSpdyFramer(int version, bool enable_compression) |
: spdy_framer_(version), |
visitor_(NULL), |
header_buffer_used_(0), |
header_buffer_valid_(false), |
header_stream_id_(SpdyFramer::kInvalidStream), |
frames_received_(0) { |
- spdy_framer_.set_enable_compression(g_enable_compression_default); |
+ //DCHECK(!enable_compression); |
willchan no longer on Chromium
2012/12/01 20:49:13
?
Ryan Hamilton
2012/12/01 23:02:25
Removed. (Sorry, left over from debugging)
|
+ spdy_framer_.set_enable_compression(enable_compression); |
memset(header_buffer_, 0, sizeof(header_buffer_)); |
} |
@@ -296,11 +291,6 @@ bool BufferedSpdyFramer::IsCompressible(const SpdyFrame& frame) const { |
return spdy_framer_.IsCompressible(frame); |
} |
-// static |
-void BufferedSpdyFramer::set_enable_compression_default(bool value) { |
- g_enable_compression_default = value; |
-} |
- |
void BufferedSpdyFramer::InitHeaderStreaming(SpdyStreamId stream_id) { |
memset(header_buffer_, 0, kHeaderBufferSize); |
header_buffer_used_ = 0; |