summaryrefslogtreecommitdiffstats
path: root/net/spdy/spdy_protocol_test.cc
diff options
context:
space:
mode:
authorthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-04 07:22:49 +0000
committerthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-04 07:22:49 +0000
commite8a57dc2c31bdb2b7ad2cbb3ace0d412455c0ad2 (patch)
tree28dc6233dc0240ed55ea5aeb4d7b32be819b10e2 /net/spdy/spdy_protocol_test.cc
parentb6b2b89a89a78a563232ae7a4fdc42b7d1663a07 (diff)
downloadchromium_src-e8a57dc2c31bdb2b7ad2cbb3ace0d412455c0ad2.zip
chromium_src-e8a57dc2c31bdb2b7ad2cbb3ace0d412455c0ad2.tar.gz
chromium_src-e8a57dc2c31bdb2b7ad2cbb3ace0d412455c0ad2.tar.bz2
Make SpdyFrame::size a constant instead of a static method so gcc can optimize the call away.
Manual changes to spdy_protocol.h and spdy_framer.cc, rest of the CL generated by running: perl -pi -e "s/SpdyFrame::size\(\)/SpdyFrame::kHeaderSize/" $(git grep -l SpdyFrame::size) This is the same as the google-internal CL 25917366 and 25938381 BUG=94125 TEST=none TBR=willchan Review URL: http://codereview.chromium.org/8790015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@112929 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/spdy/spdy_protocol_test.cc')
-rw-r--r--net/spdy/spdy_protocol_test.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/spdy/spdy_protocol_test.cc b/net/spdy/spdy_protocol_test.cc
index 7c575af..871ef21 100644
--- a/net/spdy/spdy_protocol_test.cc
+++ b/net/spdy/spdy_protocol_test.cc
@@ -48,7 +48,7 @@ namespace {
// Test our protocol constants
TEST(SpdyProtocolTest, ProtocolConstants) {
- EXPECT_EQ(8u, SpdyFrame::size());
+ EXPECT_EQ(8u, SpdyFrame::kHeaderSize);
EXPECT_EQ(8u, SpdyDataFrame::size());
EXPECT_EQ(8u, SpdyControlFrame::size());
EXPECT_EQ(18u, SpdySynStreamControlFrame::size());
@@ -74,7 +74,7 @@ TEST(SpdyProtocolTest, ProtocolConstants) {
// Test some of the protocol helper functions
TEST(SpdyProtocolTest, FrameStructs) {
- SpdyFrame frame(SpdyFrame::size());
+ SpdyFrame frame(SpdyFrame::kHeaderSize);
frame.set_length(12345);
frame.set_flags(10);
EXPECT_EQ(12345u, frame.length());