summaryrefslogtreecommitdiffstats
path: root/net/spdy
diff options
context:
space:
mode:
authorrch@chromium.org <rch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-23 01:32:03 +0000
committerrch@chromium.org <rch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-23 01:32:03 +0000
commit7b6c0ccdd71595ffc25542ee5de10f0eb555fc2d (patch)
treef02094b770c312eacc42d35305f7cbf530b4722a /net/spdy
parent6c113409bfdddd9ea3b489da7ba07cfa03b229b5 (diff)
downloadchromium_src-7b6c0ccdd71595ffc25542ee5de10f0eb555fc2d.zip
chromium_src-7b6c0ccdd71595ffc25542ee5de10f0eb555fc2d.tar.gz
chromium_src-7b6c0ccdd71595ffc25542ee5de10f0eb555fc2d.tar.bz2
Move SpdyFramer::compression_default_ to a g_enable_compression_default in spdy_framer.cc to be consisten with style.
Review URL: http://codereview.chromium.org/9835019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@128375 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/spdy')
-rw-r--r--net/spdy/spdy_framer.cc7
-rw-r--r--net/spdy/spdy_framer.h2
2 files changed, 3 insertions, 6 deletions
diff --git a/net/spdy/spdy_framer.cc b/net/spdy/spdy_framer.cc
index a5cc9e3..c8b07b8 100644
--- a/net/spdy/spdy_framer.cc
+++ b/net/spdy/spdy_framer.cc
@@ -60,7 +60,7 @@ FlagsAndLength CreateFlagsAndLength(SpdyControlFlags flags, size_t length) {
}
// By default is compression on or off.
-bool SpdyFramer::compression_default_ = true;
+bool g_enable_compression_default = true;
// The initial size of the control frame buffer; this is used internally
// as we parse through control frames. (It is exposed here for unit test
@@ -83,7 +83,6 @@ size_t SpdyFramer::kUncompressedControlFrameBufferInitialSize = 18;
const SpdyStreamId SpdyFramer::kInvalidStream = -1;
const size_t SpdyFramer::kHeaderDataChunkMaxSize = 1024;
-
#ifdef DEBUG_SPDY_STATE_CHANGES
#define CHANGE_STATE(newstate) \
{ \
@@ -143,7 +142,7 @@ SpdyFramer::SpdyFramer(int version)
current_frame_len_(0),
current_frame_capacity_(0),
validate_control_frame_sizes_(true),
- enable_compression_(compression_default_),
+ enable_compression_(g_enable_compression_default),
visitor_(NULL),
display_protocol_("SPDY"),
spdy_version_(version),
@@ -1794,7 +1793,7 @@ void SpdyFramer::set_validate_control_frame_sizes(bool value) {
}
void SpdyFramer::set_enable_compression_default(bool value) {
- compression_default_ = value;
+ g_enable_compression_default = value;
}
} // namespace net
diff --git a/net/spdy/spdy_framer.h b/net/spdy/spdy_framer.h
index 73913b1..bfe4b85 100644
--- a/net/spdy/spdy_framer.h
+++ b/net/spdy/spdy_framer.h
@@ -590,8 +590,6 @@ class NET_EXPORT_PRIVATE SpdyFramer {
// corrupt data that just looks like HTTP, but deterministic checking requires
// a lot more state.
bool probable_http_response_;
-
- static bool compression_default_;
};
} // namespace net