SPDY: Use SpdyMajorVersion rather than ints for SPDY version number.

net/spdy/spdy_frame_builder.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/spdy/spdy_frame_builder.h"
 
 #include <limits>
 
 #include "base/logging.h"
 #include "net/spdy/spdy_framer.h"
@@ skipping 44 matching lines @@
     return false;
   }
 
   length_ += length;
   return true;
 }
 
 bool SpdyFrameBuilder::WriteControlFrameHeader(const SpdyFramer& framer,
                                                SpdyFrameType type,
                                                uint8 flags) {
-  DCHECK_GT(4, framer.protocol_version());
+  DCHECK_GE(SPDY3, version_);
   DCHECK_NE(-1,
-            SpdyConstants::SerializeFrameType(framer.protocol_version(), type));
+            SpdyConstants::SerializeFrameType(version_, type));
   bool success = true;
   FlagsAndLength flags_length = CreateFlagsAndLength(
       flags, capacity_ - framer.GetControlFrameHeaderSize());
-  success &= WriteUInt16(kControlFlagMask | framer.protocol_version());
+  success &= WriteUInt16(kControlFlagMask |
+                         SpdyConstants::SerializeMajorVersion(version_));
   success &= WriteUInt16(
       SpdyConstants::SerializeFrameType(framer.protocol_version(), type));
   success &= WriteBytes(&flags_length, sizeof(flags_length));
   DCHECK_EQ(framer.GetControlFrameHeaderSize(), length());
   return success;
 }
 
 bool SpdyFrameBuilder::WriteDataFrameHeader(const SpdyFramer& framer,
                                             SpdyStreamId stream_id,
                                             uint8 flags) {
-  if (framer.protocol_version() >= 4) {
+  if (version_ > SPDY3) {
     return BeginNewFrame(framer, DATA, flags, stream_id);
   }
   DCHECK_EQ(0u, stream_id & ~kStreamIdMask);
   bool success = true;
   success &= WriteUInt32(stream_id);
   size_t length_field = capacity_ - framer.GetDataFrameMinimumSize();
   DCHECK_EQ(0u, length_field & ~static_cast<size_t>(kLengthMask));
   FlagsAndLength flags_length;
   flags_length.length_ = htonl(length_field);
   DCHECK_EQ(0, flags & ~kDataFlagsMask);
   flags_length.flags_[0] = flags;
   success &= WriteBytes(&flags_length, sizeof(flags_length));
   DCHECK_EQ(framer.GetDataFrameMinimumSize(), length());
   return success;
 }
 
 bool SpdyFrameBuilder::BeginNewFrame(const SpdyFramer& framer,
                                      SpdyFrameType type,
                                      uint8 flags,
                                      SpdyStreamId stream_id) {
   DCHECK(SpdyConstants::IsValidFrameType(version_,
       SpdyConstants::SerializeFrameType(version_, type)));
   DCHECK_EQ(0u, stream_id & ~kStreamIdMask);
-  DCHECK_LE(4, version_);
-
+  DCHECK_LT(SPDY3, framer.protocol_version());
   bool success = true;
   if (length_ > 0) {
     // Update length field for previous frame.
     OverwriteLength(framer, length_ - framer.GetPrefixLength(type));
     DLOG_IF(DFATAL, SpdyConstants::GetFrameMaximumSize(version_) < length_)
         << "Frame length  " << length_
         << " is longer than the maximum allowed length.";
   }
 
   offset_ += length_;
@@ skipping 43 matching lines @@
   return true;
 }
 
 bool SpdyFrameBuilder::RewriteLength(const SpdyFramer& framer) {
   return OverwriteLength(framer,
                          length_ - framer.GetControlFrameHeaderSize());
 }
 
 bool SpdyFrameBuilder::OverwriteLength(const SpdyFramer& framer,
                                        size_t length) {
-  if (version_ < 4) {
+  if (version_ <= SPDY3) {
     DCHECK_GE(SpdyConstants::GetFrameMaximumSize(version_) -
               framer.GetFrameMinimumSize(),
               length);
   } else {
     DCHECK_GE(SpdyConstants::GetFrameMaximumSize(version_), length);
   }
   bool success = false;
   const size_t old_length = length_;
 
-  if (version_ < 4) {
+  if (version_ <= SPDY3) {
     FlagsAndLength flags_length = CreateFlagsAndLength(
         0,  // We're not writing over the flags value anyway.
         length);
 
     // Write into the correct location by temporarily faking the offset.
     length_ = 5;  // Offset at which the length field occurs.
     success = WriteBytes(reinterpret_cast<char*>(&flags_length) + 1,
                          sizeof(flags_length) - 1);
   } else {
     length_ = 0;
     success = WriteUInt16(length);
   }
 
   length_ = old_length;
   return success;
 }
 
 bool SpdyFrameBuilder::OverwriteFlags(const SpdyFramer& framer,
                                       uint8 flags) {
-  DCHECK_LE(SPDY4, framer.protocol_version());
+  DCHECK_LT(SPDY3, framer.protocol_version());
   bool success = false;
   const size_t old_length = length_;
   // Flags are the fourth octet in the frame prefix.
   length_ = 3;
   success = WriteUInt8(flags);
   length_ = old_length;
   return success;
 }
 
 bool SpdyFrameBuilder::CanWrite(size_t length) const {
   if (length > kLengthMask) {
     DCHECK(false);
     return false;
   }
 
   if (offset_ + length_ + length > capacity_) {
     DCHECK(false);
     return false;
   }
 
   return true;
 }
 
 }  // namespace net