Deprecate SpdyControlFrame::size in favor of SpdyControlFrame::kHeaderSize

net/spdy/spdy_framer.cc

 // Copyright (c) 2011 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.
 
 // TODO(rtenhove) clean up frame buffer size calculations so that we aren't
 // constantly adding and subtracting header sizes; this is ugly and error-
 // prone.
 
 #include "net/spdy/spdy_framer.h"
 
@@ skipping 405 matching lines @@
     DLOG(INFO) << "NOOP control frame found. Ignoring.";
     CHANGE_STATE(SPDY_AUTO_RESET);
     return;
   }
 
   if (validate_control_frame_sizes_) {
     // Do some sanity checking on the control frame sizes.
     switch (current_control_frame.type()) {
       case SYN_STREAM:
         if (current_control_frame.length() <
-            SpdySynStreamControlFrame::size() - SpdyControlFrame::size())
+            SpdySynStreamControlFrame::size() - SpdyControlFrame::kHeaderSize)
           set_error(SPDY_INVALID_CONTROL_FRAME);
         break;
       case SYN_REPLY:
         if (current_control_frame.length() <
-            SpdySynReplyControlFrame::size() - SpdyControlFrame::size())
+            SpdySynReplyControlFrame::size() - SpdyControlFrame::kHeaderSize)
           set_error(SPDY_INVALID_CONTROL_FRAME);
         break;
       case RST_STREAM:
         if (current_control_frame.length() !=
             SpdyRstStreamControlFrame::size() - SpdyFrame::kHeaderSize)
           set_error(SPDY_INVALID_CONTROL_FRAME);
         break;
       case SETTINGS:
         if (current_control_frame.length() <
-            SpdySettingsControlFrame::size() - SpdyControlFrame::size())
+            SpdySettingsControlFrame::size() - SpdyControlFrame::kHeaderSize)
           set_error(SPDY_INVALID_CONTROL_FRAME);
         break;
       case GOAWAY:
         if (current_control_frame.length() !=
             SpdyGoAwayControlFrame::size() - SpdyFrame::kHeaderSize)
           set_error(SPDY_INVALID_CONTROL_FRAME);
         break;
       case HEADERS:
         if (current_control_frame.length() <
-            SpdyHeadersControlFrame::size() - SpdyControlFrame::size())
+            SpdyHeadersControlFrame::size() - SpdyControlFrame::kHeaderSize)
           set_error(SPDY_INVALID_CONTROL_FRAME);
         break;
       case WINDOW_UPDATE:
         if (current_control_frame.length() !=
-            SpdyWindowUpdateControlFrame::size() - SpdyControlFrame::size())
+            SpdyWindowUpdateControlFrame::size() -
+            SpdyControlFrame::kHeaderSize)
           set_error(SPDY_INVALID_CONTROL_FRAME);
         break;
       case PING:
         if (current_control_frame.length() !=
-            SpdyPingControlFrame::size() - SpdyControlFrame::size())
+            SpdyPingControlFrame::size() - SpdyControlFrame::kHeaderSize)
           set_error(SPDY_INVALID_CONTROL_FRAME);
         break;
       default:
         LOG(WARNING) << "Valid " << display_protocol_
                      << " control frame with unhandled type: "
                      << current_control_frame.type();
         DCHECK(false);
         set_error(SPDY_INVALID_CONTROL_FRAME);
         break;
     }
@@ skipping 1216 matching lines @@
 
 void SpdyFramer::set_enable_compression_default(bool value) {
   compression_default_ = value;
 }
 
 void SpdyFramer::set_validate_control_frame_sizes(bool value) {
   validate_control_frame_sizes_ = value;
 }
 
 }  // namespace spdy