Clean up max_frame_size related constants, move storage of setting to the framer.

net/spdy/spdy_protocol.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_protocol.h"
 
 #include "base/memory/ptr_util.h"
 #include "net/spdy/spdy_bug_tracker.h"
 
 namespace net {
@@ skipping 673 matching lines @@
           return 13;
         default:
           SPDY_BUG << "Serializing unhandled GOAWAY status " << status;
           return -1;
       }
   }
   SPDY_BUG << "Unknown SpdyMajorVersion " << version;
   return -1;
 }
 
-size_t SpdyConstants::GetDataFrameMinimumSize(SpdyMajorVersion version) {
+size_t SpdyConstants::GetFrameHeaderSize(SpdyMajorVersion version) {
   switch (version) {
     case SPDY3:
       return 8;
     case HTTP2:
       return 9;
   }
   SPDY_BUG << "Unhandled SPDY version.";
   return 0;
 }
 
+size_t SpdyConstants::GetDataFrameMinimumSize(SpdyMajorVersion version) {
+  return GetFrameHeaderSize(version);
+}
+
 size_t SpdyConstants::GetControlFrameHeaderSize(SpdyMajorVersion version) {
-  switch (version) {
-    case SPDY3:
-      return 8;
-    case HTTP2:
-      return 9;
-  }
-  SPDY_BUG << "Unhandled SPDY version.";
-  return 0;
+  return GetFrameHeaderSize(version);
 }
 
 size_t SpdyConstants::GetPrefixLength(SpdyFrameType type,
                                       SpdyMajorVersion version) {
-  if (type != DATA) {
-     return GetControlFrameHeaderSize(version);
-  } else {
-     return GetDataFrameMinimumSize(version);
-  }
+  return GetFrameHeaderSize(version);
 }
 
-size_t SpdyConstants::GetFrameMaximumSize(SpdyMajorVersion version) {
-  if (version == SPDY3) {
-    // 24-bit length field plus eight-byte frame header.
-    return ((1 << 24) - 1) + 8;
-  } else {
-    // Max payload of 2^14 plus nine-byte frame header.
-    // TODO(dahollings): Change this to the actual spec
-    // max of (1 << 24) - 1 + 9.
-    return (1 << 14) + 9;
-  }
+size_t SpdyConstants::GetMaxFrameSizeLimit(SpdyMajorVersion version) {
+  return kSpdyMaxFrameSizeLimit + GetFrameHeaderSize(version);
 }
 
 size_t SpdyConstants::GetSizeOfSizeField() {
   return sizeof(uint32_t);
 }
 
 size_t SpdyConstants::GetPerHeaderOverhead(SpdyMajorVersion version) {
   return (version == net::HTTP2) ? 32 : 0;
 }
 
@@ skipping 145 matching lines @@
 
 void SpdyAltSvcIR::Visit(SpdyFrameVisitor* visitor) const {
   return visitor->VisitAltSvc(*this);
 }
 
 void SpdyPriorityIR::Visit(SpdyFrameVisitor* visitor) const {
   return visitor->VisitPriority(*this);
 }
 
 }  // namespace net