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

Deprecate SpdyControlFrame::size in favor of SpdyControlFrame::kHeaderSize
inherited from the base class.

Manual changes only to spdy_protocol.h, the rest of the CL generated by
running and then manually fixing the one 80 col violation:

 perl -pi -e "s/SpdyControlFrame::size\(\)/SpdyControlFrame::kHeaderSize/"  $(git grep -l SpdyControlFrame::size)

This is the same as the google-internal CL 25980588

BUG=none
TEST=none


Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=113865

[willchan no longer on Chromium, 2011-12-09 16:44:02]

LGTM

On Fri, Dec 9, 2011 at 8:19 AM, <thakis@chromium.org> wrote:

> Reviewers: willchan,
>
> Description:
> Deprecate SpdyControlFrame::size in favor of SpdyControlFrame::kHeaderSize
> inherited from the base class.
>
> Manual changes only to spdy_protocol.h, the rest of the CL generated by
> running and then manually fixing the one 80 col violation:
>
>  perl -pi -e "s/SpdyControlFrame::size\(\)/**
> SpdyControlFrame::kHeaderSize/**"
> $(git grep -l SpdyControlFrame::size)
>
> This is the same as the google-internal CL 25980588
>
> BUG=none
> TEST=none
>
>
> Please review this at
http://codereview.chromium.**org/8898003/<http://codereview.chromium.org/8898...
>
> SVN Base:
svn://svn.chromium.org/chrome/**trunk/src<http://svn.chromium.org/chrome/trunk/src>
>
> Affected files:
>  M net/spdy/spdy_framer.cc
>  M net/spdy/spdy_framer_test.cc
>  M net/spdy/spdy_protocol.h
>  M net/spdy/spdy_protocol_test.cc
>
>
> Index: net/spdy/spdy_framer.cc
> diff --git a/net/spdy/spdy_framer.cc b/net/spdy/spdy_framer.cc
> index 9b24ba01f3a1449b670cf1a7a65d8d**300307f330..**
> 7734eb8b42dbb776e94bef50370b91**cfd916e854 100644
> --- a/net/spdy/spdy_framer.cc
> +++ b/net/spdy/spdy_framer.cc
> @@ -423,12 +423,12 @@ void SpdyFramer::**ProcessControlFrameHeader() {
>     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:
> @@ -438,7 +438,7 @@ void SpdyFramer::**ProcessControlFrameHeader() {
>         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:
> @@ -448,17 +448,18 @@ void SpdyFramer::**ProcessControlFrameHeader() {
>         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:
> Index: net/spdy/spdy_framer_test.cc
> diff --git a/net/spdy/spdy_framer_test.cc b/net/spdy/spdy_framer_test.cc
> index 64a4f84975278cbfab18a546607e00**c93d2058a2..**
> 394d7c44c3a309865fd21630defec0**bd713f83f3 100644
> --- a/net/spdy/spdy_framer_test.cc
> +++ b/net/spdy/spdy_framer_test.cc
> @@ -1593,7 +1593,7 @@ TEST_F(SpdyFramerTest, ExpandBuffer_HeapSmash) {
>     TestSpdyVisitor visitor;
>     visitor.SimulateInFramer(
>         reinterpret_cast<unsigned char*>(template_frame.get()->**data()),
> -         template_frame.get()->length() + SpdyControlFrame::size());
> +         template_frame.get()->length() + SpdyControlFrame::kHeaderSize)*
> *;
>     EXPECT_EQ(1, visitor.syn_frame_count_);
>   }
>  }
> Index: net/spdy/spdy_protocol.h
> diff --git a/net/spdy/spdy_protocol.h b/net/spdy/spdy_protocol.h
> index 2519814f182d1888f073add57dbe13**bc5674c253..**
> f2b571567233e87ddf8accaa9d2dc2**e2996f7c17 100644
> --- a/net/spdy/spdy_protocol.h
> +++ b/net/spdy/spdy_protocol.h
> @@ -470,10 +470,6 @@ class SpdyControlFrame : public SpdyFrame {
>     return type() == SYN_STREAM || type() == SYN_REPLY || type() ==
> HEADERS;
>   }
>
> -  // Returns the size of the SpdyFrameBlock structure.
> -  // Note: this is not the size of the SpdyControlFrame class.
> -  static size_t size() { return sizeof(SpdyFrameBlock); }
> -
>   // The size of the 'Number of Name/Value pairs' field in a Name/Value
> block.
>   static const size_t kNumNameValuePairsSize = 2;
>
> Index: net/spdy/spdy_protocol_test.cc
> diff --git a/net/spdy/spdy_protocol_test.**cc
> b/net/spdy/spdy_protocol_test.**cc
> index 871ef21072f0631c9b290b831e9201**ab01afc012..**
> 46dd5f071f335e992d80ea5380321f**2082b0ae16 100644
> --- a/net/spdy/spdy_protocol_test.**cc
> +++ b/net/spdy/spdy_protocol_test.**cc
> @@ -50,7 +50,7 @@ namespace {
>  TEST(SpdyProtocolTest, ProtocolConstants) {
>   EXPECT_EQ(8u, SpdyFrame::kHeaderSize);
>   EXPECT_EQ(8u, SpdyDataFrame::size());
> -  EXPECT_EQ(8u, SpdyControlFrame::size());
> +  EXPECT_EQ(8u, SpdyControlFrame::kHeaderSize)**;
>   EXPECT_EQ(18u, SpdySynStreamControlFrame::**size());
>   EXPECT_EQ(14u, SpdySynReplyControlFrame::**size());
>   EXPECT_EQ(16u, SpdyRstStreamControlFrame::**size());
> @@ -265,7 +265,7 @@ TEST(SpdyProtocolTest, TestSpdySettingsFrame) {
>  }
>
>  TEST(SpdyProtocolTest, HasHeaderBlock) {
> -  SpdyControlFrame frame(SpdyControlFrame::size()**);
> +  SpdyControlFrame frame(SpdyControlFrame::**kHeaderSize);
>   for (SpdyControlType type = SYN_STREAM;
>       type < NUM_CONTROL_FRAME_TYPES;
>       type = static_cast<SpdyControlType>(**type + 1)) {
> @@ -308,7 +308,7 @@ TEST(SpdyProtocolDeathTest, TestDataFrame) {
>
>  TEST(SpdyProtocolDeathTest, TestSpdyControlFrameStreamId) {
>   SpdyControlFrame frame_store(**SpdySynStreamControlFrame::**size());
> -  memset(frame_store.data(), '1', SpdyControlFrame::size());
> +  memset(frame_store.data(), '1', SpdyControlFrame::kHeaderSize)**;
>   SpdySynStreamControlFrame* frame =
>       reinterpret_cast<**SpdySynStreamControlFrame*>(&**frame_store);
>
> @@ -324,7 +324,7 @@ TEST(SpdyProtocolDeathTest,
> TestSpdyControlFrameStreamId) {
>  TEST(SpdyProtocolDeathTest, TestSpdyControlFrameVersion) {
>   const unsigned int kVersionMask = 0x7fff;
>   SpdyControlFrame frame(**SpdySynStreamControlFrame::**size());
> -  memset(frame.data(), '1', SpdyControlFrame::size());
> +  memset(frame.data(), '1', SpdyControlFrame::kHeaderSize)**;
>
>   // Set the version to various values, and make sure it does not affect
> the
>   // type.
> @@ -343,8 +343,8 @@ TEST(SpdyProtocolDeathTest,
> TestSpdyControlFrameVersion) {
>  }
>
>  TEST(SpdyProtocolDeathTest, TestSpdyControlFrameType) {
> -  SpdyControlFrame frame(SpdyControlFrame::size()**);
> -  memset(frame.data(), 255, SpdyControlFrame::size());
> +  SpdyControlFrame frame(SpdyControlFrame::**kHeaderSize);
> +  memset(frame.data(), 255, SpdyControlFrame::kHeaderSize)**;
>
>   // type() should be out of bounds.
>   EXPECT_FALSE(frame.**AppearsToBeAValidControlFrame(**));
>
>
>

[commit-bot: I haz the power, 2011-12-09 16:45:26]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/thakis@chromium.org/8898003/1

[commit-bot: I haz the power, 2011-12-09 19:03:14]

Try job failure for 8898003-1 (retry) on mac_rel for step "browser_tests".
It's a second try, previously, step "browser_tests" failed.
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=mac_rel&nu...

[commit-bot: I haz the power, 2011-12-09 19:26:32]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/thakis@chromium.org/8898003/1

[commit-bot: I haz the power, 2011-12-09 20:56:42]

Try job failure for 8898003-1 (retry) on linux_rel for step "ui_tests" (clobber
build).
It's a second try, previously, step "compile" failed.
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=linux_rel&...

[commit-bot: I haz the power, 2011-12-09 20:58:26]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/thakis@chromium.org/8898003/1

[commit-bot: I haz the power, 2011-12-09 22:24:40]

Change committed as 113865