diff options
| author | rtenneti@chromium.org <rtenneti@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-11 03:33:29 +0000 |
|---|---|---|
| committer | rtenneti@chromium.org <rtenneti@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-11 03:33:29 +0000 |
| commit | 2074e5e82dee830ce07695cd71a1fe04d782f924 (patch) | |
| tree | bb14ab1b4ddf31193c71527e94eda5150436afbf /net | |
| parent | 7607e268415f277bd5d6d00c285221bfa84e1aae (diff) | |
| download | chromium_src-2074e5e82dee830ce07695cd71a1fe04d782f924.zip chromium_src-2074e5e82dee830ce07695cd71a1fe04d782f924.tar.gz chromium_src-2074e5e82dee830ce07695cd71a1fe04d782f924.tar.bz2 | |
Revert 181627
> Revert 181626
> > Revert 181569
> > > SPDY - Added back code that deleted read_pending_.
> > >
> > > R=rch@chromium.org
> > > BUG=175069
> > >
> > > Review URL: https://chromiumcodereview.appspot.com/12224078
> >
> > TBR=rtenneti@chromium.org
> > Review URL: https://codereview.chromium.org/12208103
>
> TBR=rtenneti@chromium.org
> Review URL: https://codereview.chromium.org/12212101
Reverting CL https://chromiumcodereview.appspot.com/12224078
because https://chromiumcodereview.appspot.com/12212102/
fixed the crash.
TBR=rtenneti@chromium.org
Review URL: https://codereview.chromium.org/12213106
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@181660 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
| -rw-r--r-- | net/spdy/spdy_session.cc | 14 | ||||
| -rw-r--r-- | net/spdy/spdy_session.h | 1 |
2 files changed, 1 insertions, 14 deletions
diff --git a/net/spdy/spdy_session.cc b/net/spdy/spdy_session.cc index eb5fa1d..ceed0c7 100644 --- a/net/spdy/spdy_session.cc +++ b/net/spdy/spdy_session.cc @@ -233,7 +233,6 @@ SpdySession::SpdySession(const HostPortProxyPair& host_port_proxy_pair, http_server_properties_(http_server_properties), connection_(new ClientSocketHandle), read_buffer_(new IOBuffer(kReadBufferSize)), - read_pending_(false), stream_hi_water_mark_(kFirstStreamId), write_pending_(false), delayed_write_pending_(false), @@ -782,13 +781,11 @@ LoadState SpdySession::GetLoadState() const { void SpdySession::OnReadComplete(int bytes_read) { DCHECK_NE(state_, STATE_DO_READ); - read_pending_ = false; DoLoop(bytes_read); } void SpdySession::StartRead() { DCHECK_NE(state_, STATE_DO_READ_COMPLETE); - read_pending_ = false; DoLoop(OK); } @@ -802,9 +799,6 @@ int SpdySession::DoLoop(int result) { scoped_refptr<SpdySession> self(this); do { - if (read_pending_) - return OK; - switch (state_) { case STATE_DO_READ: DCHECK_EQ(result, OK); @@ -826,7 +820,6 @@ int SpdySession::DoLoop(int result) { } int SpdySession::DoRead() { - DCHECK(!read_pending_); if (bytes_read_ > kMaxReadBytes) { state_ = STATE_DO_READ; MessageLoop::current()->PostTask( @@ -839,13 +832,10 @@ int SpdySession::DoRead() { CHECK(connection_.get()); CHECK(connection_->socket()); state_ = STATE_DO_READ_COMPLETE; - int result = connection_->socket()->Read( + return connection_->socket()->Read( read_buffer_.get(), kReadBufferSize, base::Bind(&SpdySession::OnReadComplete, base::Unretained(this))); - if (result == net::ERR_IO_PENDING) - read_pending_ = true; - return result; } int SpdySession::DoReadComplete(int result) { @@ -853,8 +843,6 @@ int SpdySession::DoReadComplete(int result) { // buffer (32KB). // TODO(mbelshe): support arbitrarily large frames! - DCHECK(!read_pending_); - if (result <= 0) { // Session is tearing down. net::Error error = static_cast<net::Error>(result); diff --git a/net/spdy/spdy_session.h b/net/spdy/spdy_session.h index e2c73ed..c0b5d15 100644 --- a/net/spdy/spdy_session.h +++ b/net/spdy/spdy_session.h @@ -625,7 +625,6 @@ class NET_EXPORT SpdySession : public base::RefCounted<SpdySession>, // The read buffer used to read data from the socket. scoped_refptr<IOBuffer> read_buffer_; - bool read_pending_; int stream_hi_water_mark_; // The next stream id to use. |