summaryrefslogtreecommitdiffstats
path: root/net/flip/flip_framer.cc
diff options
context:
space:
mode:
authormbelshe@google.com <mbelshe@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-14 20:06:12 +0000
committermbelshe@google.com <mbelshe@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-14 20:06:12 +0000
commit66814bb0eb9fd82cb6acd58ddc9292555bd98322 (patch)
tree4f6dba5091239e29d963ac9f96e48dd19deafb97 /net/flip/flip_framer.cc
parentaffe8fef0a2d2e0115c3f0607df819d3e9db6237 (diff)
downloadchromium_src-66814bb0eb9fd82cb6acd58ddc9292555bd98322.zip
chromium_src-66814bb0eb9fd82cb6acd58ddc9292555bd98322.tar.gz
chromium_src-66814bb0eb9fd82cb6acd58ddc9292555bd98322.tar.bz2
Update the flip_protocol header to add flags to all frames
and a FIN flag. TEST=flip_framer_test.cc BUG=none Review URL: http://codereview.chromium.org/275017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29005 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/flip/flip_framer.cc')
-rw-r--r--net/flip/flip_framer.cc5
1 files changed, 1 insertions, 4 deletions
diff --git a/net/flip/flip_framer.cc b/net/flip/flip_framer.cc
index 9793c3b..b5b611f 100644
--- a/net/flip/flip_framer.cc
+++ b/net/flip/flip_framer.cc
@@ -20,9 +20,6 @@ static const size_t kControlFrameBufferInitialSize = 32 * 1024;
// TODO(mbelshe): We should make this stream-based so there are no limits.
static const size_t kControlFrameBufferMaxSize = 64 * 1024;
-// This implementation of Flip is version 1.
-static const int kFlipProtocolVersion = 1;
-
// By default is compression on or off.
bool FlipFramer::compression_default_ = true;
@@ -652,7 +649,7 @@ FlipFrame* FlipFramer::DecompressFrame(const FlipFrame* frame) {
if (!frame->is_control_frame()) {
const FlipDataFrame* data_frame =
reinterpret_cast<const FlipDataFrame*>(frame);
- if (!data_frame->flags() & DATA_FLAG_COMPRESSED)
+ if ((data_frame->flags() & DATA_FLAG_COMPRESSED) == 0)
return DuplicateFrame(frame);
}