diff options
author | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-15 19:42:37 +0000 |
---|---|---|
committer | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-15 19:42:37 +0000 |
commit | 30c86a6072ed6a4edb717f435a59898cebc0dd7c (patch) | |
tree | af9b9f2e76a8d69d285d6400ce6b98d844a4c344 /net | |
parent | 60f6c1202b62693c4f23733cfa9a102b5f43e1cc (diff) | |
download | chromium_src-30c86a6072ed6a4edb717f435a59898cebc0dd7c.zip chromium_src-30c86a6072ed6a4edb717f435a59898cebc0dd7c.tar.gz chromium_src-30c86a6072ed6a4edb717f435a59898cebc0dd7c.tar.bz2 |
Remove unused state SPDY_DONE from SpdyFramer.
This lands server change 42256860.
Review URL: https://codereview.chromium.org/12263030
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@182792 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
-rw-r--r-- | net/spdy/buffered_spdy_framer.cc | 3 | ||||
-rw-r--r-- | net/spdy/buffered_spdy_framer_spdy2_unittest.cc | 2 | ||||
-rw-r--r-- | net/spdy/buffered_spdy_framer_spdy3_unittest.cc | 2 | ||||
-rw-r--r-- | net/spdy/spdy_framer.cc | 3 | ||||
-rw-r--r-- | net/spdy/spdy_framer.h | 1 | ||||
-rw-r--r-- | net/spdy/spdy_framer_test.cc | 4 | ||||
-rw-r--r-- | net/spdy/spdy_session.cc | 2 |
7 files changed, 1 insertions, 16 deletions
diff --git a/net/spdy/buffered_spdy_framer.cc b/net/spdy/buffered_spdy_framer.cc index f6853df..6942f6a 100644 --- a/net/spdy/buffered_spdy_framer.cc +++ b/net/spdy/buffered_spdy_framer.cc @@ -207,8 +207,7 @@ SpdyFramer::SpdyState BufferedSpdyFramer::state() const { } bool BufferedSpdyFramer::MessageFullyRead() { - return state() == SpdyFramer::SPDY_DONE || - state() == SpdyFramer::SPDY_AUTO_RESET; + return state() == SpdyFramer::SPDY_AUTO_RESET; } bool BufferedSpdyFramer::HasError() { diff --git a/net/spdy/buffered_spdy_framer_spdy2_unittest.cc b/net/spdy/buffered_spdy_framer_spdy2_unittest.cc index 6ee1b29..192192b 100644 --- a/net/spdy/buffered_spdy_framer_spdy2_unittest.cc +++ b/net/spdy/buffered_spdy_framer_spdy2_unittest.cc @@ -131,8 +131,6 @@ class TestBufferedSpdyVisitor : public BufferedSpdyFramerVisitorInterface { buffered_spdy_framer_.ProcessInput(input_ptr, bytes_read); input_remaining -= bytes_processed; input_ptr += bytes_processed; - if (buffered_spdy_framer_.state() == SpdyFramer::SPDY_DONE) - buffered_spdy_framer_.Reset(); } } diff --git a/net/spdy/buffered_spdy_framer_spdy3_unittest.cc b/net/spdy/buffered_spdy_framer_spdy3_unittest.cc index db563e9..733b473 100644 --- a/net/spdy/buffered_spdy_framer_spdy3_unittest.cc +++ b/net/spdy/buffered_spdy_framer_spdy3_unittest.cc @@ -129,8 +129,6 @@ class TestBufferedSpdyVisitor : public BufferedSpdyFramerVisitorInterface { buffered_spdy_framer_.ProcessInput(input_ptr, bytes_read); input_remaining -= bytes_processed; input_ptr += bytes_processed; - if (buffered_spdy_framer_.state() == SpdyFramer::SPDY_DONE) - buffered_spdy_framer_.Reset(); } } diff --git a/net/spdy/spdy_framer.cc b/net/spdy/spdy_framer.cc index 52f7bf3..f92a0a5 100644 --- a/net/spdy/spdy_framer.cc +++ b/net/spdy/spdy_framer.cc @@ -247,8 +247,6 @@ const char* SpdyFramer::StateToString(int state) { switch (state) { case SPDY_ERROR: return "ERROR"; - case SPDY_DONE: - return "DONE"; case SPDY_AUTO_RESET: return "AUTO_RESET"; case SPDY_RESET: @@ -371,7 +369,6 @@ size_t SpdyFramer::ProcessInput(const char* data, size_t len) { previous_state_ = state_; switch (state_) { case SPDY_ERROR: - case SPDY_DONE: goto bottom; case SPDY_AUTO_RESET: diff --git a/net/spdy/spdy_framer.h b/net/spdy/spdy_framer.h index 37eaa95..7264100 100644 --- a/net/spdy/spdy_framer.h +++ b/net/spdy/spdy_framer.h @@ -255,7 +255,6 @@ class NET_EXPORT_PRIVATE SpdyFramer { // and avoid exposing through the header. (Needed for test) enum SpdyState { SPDY_ERROR, - SPDY_DONE, SPDY_RESET, SPDY_AUTO_RESET, SPDY_READING_COMMON_HEADER, diff --git a/net/spdy/spdy_framer_test.cc b/net/spdy/spdy_framer_test.cc index cb797d2..de0b7e7 100644 --- a/net/spdy/spdy_framer_test.cc +++ b/net/spdy/spdy_framer_test.cc @@ -513,8 +513,6 @@ class TestSpdyVisitor : public SpdyFramerVisitorInterface, size_t bytes_processed = framer_.ProcessInput(input_ptr, bytes_read); input_remaining -= bytes_processed; input_ptr += bytes_processed; - if (framer_.state() == SpdyFramer::SPDY_DONE) - framer_.Reset(); } } @@ -3044,8 +3042,6 @@ TEST_P(SpdyFramerTest, SizesTest) { TEST_P(SpdyFramerTest, StateToStringTest) { EXPECT_STREQ("ERROR", SpdyFramer::StateToString(SpdyFramer::SPDY_ERROR)); - EXPECT_STREQ("DONE", - SpdyFramer::StateToString(SpdyFramer::SPDY_DONE)); EXPECT_STREQ("AUTO_RESET", SpdyFramer::StateToString(SpdyFramer::SPDY_AUTO_RESET)); EXPECT_STREQ("RESET", diff --git a/net/spdy/spdy_session.cc b/net/spdy/spdy_session.cc index c8b29bd..df4b860 100644 --- a/net/spdy/spdy_session.cc +++ b/net/spdy/spdy_session.cc @@ -867,8 +867,6 @@ int SpdySession::DoReadComplete(int result) { buffered_spdy_framer_->ProcessInput(data, result); result -= bytes_processed; data += bytes_processed; - if (buffered_spdy_framer_->state() == SpdyFramer::SPDY_DONE) - buffered_spdy_framer_->Reset(); } if (IsConnected()) |