SPDY cleanup: use ParseFrameType and SerializeFrameType

net/spdy/spdy_protocol.h

 // 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.
 
 // This file contains some protocol structures for use with SPDY 2 and 3
 // The SPDY 2 spec can be found at:
 // http://dev.chromium.org/spdy/spdy-protocol/spdy-protocol-draft2
 // The SPDY 3 spec can be found at:
 // http://dev.chromium.org/spdy/spdy-protocol/spdy-protocol-draft3
 
@@ skipping 254 matching lines @@
 const char kHttp2ConnectionHeaderPrefix[] = {
   0x50, 0x52, 0x49, 0x20, 0x2a, 0x20, 0x48, 0x54,  // PRI * HT
   0x54, 0x50, 0x2f, 0x32, 0x2e, 0x30, 0x0d, 0x0a,  // TP/2.0..
   0x0d, 0x0a, 0x53, 0x4d, 0x0d, 0x0a, 0x0d, 0x0a   // ..SM....
 };
 const int kHttp2ConnectionHeaderPrefixSize =
     arraysize(kHttp2ConnectionHeaderPrefix);
 
 // Types of SPDY frames.
 enum SpdyFrameType {
-  DATA = 0,
-  SYN_STREAM = 1,
-  FIRST_CONTROL_TYPE = SYN_STREAM,
+  DATA,
+  SYN_STREAM,
   SYN_REPLY,
   RST_STREAM,
   SETTINGS,
-  NOOP,  // Because it is valid in SPDY/2, kept for identifiability/enum order.
   PING,
   GOAWAY,
   HEADERS,
   WINDOW_UPDATE,
-  CREDENTIAL,  // No longer valid.  Kept for identifiability/enum order.
+  CREDENTIAL = 10,  // No longer valid.  Kept for identifiability.
   BLOCKED,
   PUSH_PROMISE,
   CONTINUATION,
   ALTSVC,
-  PRIORITY,
-  LAST_CONTROL_TYPE = PRIORITY
+  PRIORITY
 };
 
 // Flags on data packets.
 enum SpdyDataFlags {
   DATA_FLAG_NONE = 0x00,
   DATA_FLAG_FIN = 0x01,
   DATA_FLAG_END_SEGMENT = 0x02,
   DATA_FLAG_PAD_LOW = 0x08,
   DATA_FLAG_PAD_HIGH = 0x10,
   DATA_FLAG_COMPRESSED = 0x20,
@@ skipping 130 matching lines @@
   // use IsValidFrameType() to verify validity of frame type fields.
   static SpdyFrameType ParseFrameType(SpdyMajorVersion version,
                                       int frame_type_field);
 
   // Serializes a given frame type to the on-the-wire enumeration value for the
   // given protocol version.
   // Returns -1 on failure (I.E. Invalid frame type for the given version).
   static int SerializeFrameType(SpdyMajorVersion version,
                                 SpdyFrameType frame_type);
 
+  // Returns the frame type for non-control (i.e. data) frames
+  // in the given SPDY version.
+  static int DataFrameType(SpdyMajorVersion version);
+
   // Returns true if a given on-the-wire enumeration of a setting id is valid
   // for a given protocol version, false otherwise.
   static bool IsValidSettingId(SpdyMajorVersion version, int setting_id_field);
 
   // Parses a setting id from an on-the-wire enumeration of a given protocol
   // version.
   // Behavior is undefined for invalid setting id fields; consumers should first
   // use IsValidSettingId() to verify validity of setting id fields.
   static SpdySettingsIds ParseSettingId(SpdyMajorVersion version,
                                         int setting_id_field);
@@ skipping 575 matching lines @@
   SpdyFrameVisitor() {}
   virtual ~SpdyFrameVisitor() {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(SpdyFrameVisitor);
 };
 
 }  // namespace net
 
 #endif  // NET_SPDY_SPDY_PROTOCOL_H_