Introduce new SpdyConstants class

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 42 matching lines @@
     return false;
   }
 
   length_ += length;
   return true;
 }
 
 bool SpdyFrameBuilder::WriteControlFrameHeader(const SpdyFramer& framer,
                                                SpdyFrameType type,
                                                uint8 flags) {
-  DCHECK_GE(type, FIRST_CONTROL_TYPE);
-  DCHECK_LE(type, LAST_CONTROL_TYPE);
   DCHECK_GT(4, framer.protocol_version());
+  DCHECK_NE(-1,
+            SpdyConstants::SerializeFrameType(framer.protocol_version(), type));
   bool success = true;
   FlagsAndLength flags_length = CreateFlagsAndLength(
       flags, capacity_ - framer.GetControlFrameHeaderSize());
   success &= WriteUInt16(kControlFlagMask | framer.protocol_version());
-  success &= WriteUInt16(type);
+  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) {
     return WriteFramePrefix(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::WriteFramePrefix(const SpdyFramer& framer,
                                         SpdyFrameType type,
                                         uint8 flags,
                                         SpdyStreamId stream_id) {
-  DCHECK_LE(DATA, type);
-  DCHECK_GE(LAST_CONTROL_TYPE, type);
+  DCHECK_NE(-1,
+            SpdyConstants::SerializeFrameType(framer.protocol_version(), type));
   DCHECK_EQ(0u, stream_id & ~kStreamIdMask);
   DCHECK_LE(4, framer.protocol_version());
   bool success = true;
   // Upstream DCHECK's that capacity_ is under the maximum frame size at this
   // point. Chromium does not, because of the large additional zlib inflation
   // factor we use. (Frame size is is still checked by OverwriteLength() below).
   if (type != DATA) {
     success &= WriteUInt16(capacity_ - framer.GetControlFrameHeaderSize());
   } else {
     success &= WriteUInt16(capacity_ - framer.GetDataFrameMinimumSize());
   }
-  success &= WriteUInt8(type);
+  success &= WriteUInt8(
+      SpdyConstants::SerializeFrameType(framer.protocol_version(), type));
   success &= WriteUInt8(flags);
   success &= WriteUInt32(stream_id);
   DCHECK_EQ(framer.GetDataFrameMinimumSize(), length());
   return success;
 }
 
 bool SpdyFrameBuilder::WriteString(const std::string& value) {
   if (value.size() > 0xffff) {
     DCHECK(false) << "Tried to write string with length > 16bit.";
     return false;
@@ skipping 78 matching lines @@
 
   if (length_ + length > capacity_) {
     DCHECK(false);
     return false;
   }
 
   return true;
 }
 
 }  // namespace net