diff options
author | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-15 00:21:42 +0000 |
---|---|---|
committer | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-15 00:21:42 +0000 |
commit | d46715c9e23b6a27a4f3484fa3c2f9e213c8ed14 (patch) | |
tree | a0619f483850b39c6bbb34e3e191ef4cb8f35059 /net/websockets/websocket_job.cc | |
parent | bf97e8bcd8225c395db813ecc0b0ed84194b0d04 (diff) | |
download | chromium_src-d46715c9e23b6a27a4f3484fa3c2f9e213c8ed14.zip chromium_src-d46715c9e23b6a27a4f3484fa3c2f9e213c8ed14.tar.gz chromium_src-d46715c9e23b6a27a4f3484fa3c2f9e213c8ed14.tar.bz2 |
[SPDY] Plumb SPDY frame type through write queue
This lets us remove the waiting_completions_ queue
from SpdyStream, and also lets us guarantee that
a stream is activated only when SYN_STREAM is sent.
Change some SpdyStream::Delegate function signatures.
Also add SpdySendStatus to replace some booleans.
Change SpdyStream::send_bytes_ to only track data frames.
Add GetFrame{Min,Max}imumSize() function to SpdyFramer.
Fix calculation of frame overhead that is buggy with SPDY/4 and
add regression test.
BUG=176592,231003
Review URL: https://chromiumcodereview.appspot.com/13977002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@194127 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/websockets/websocket_job.cc')
-rw-r--r-- | net/websockets/websocket_job.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/websockets/websocket_job.cc b/net/websockets/websocket_job.cc index 90ed553..3aeb8aa 100644 --- a/net/websockets/websocket_job.cc +++ b/net/websockets/websocket_job.cc @@ -295,7 +295,7 @@ void WebSocketJob::OnCreatedSpdyStream(int result) { CompleteIO(result); } -void WebSocketJob::OnSentSpdyHeaders(int result) { +void WebSocketJob::OnSentSpdyHeaders() { DCHECK_NE(INITIALIZED, state_); if (state_ != CONNECTING) return; @@ -320,14 +320,14 @@ int WebSocketJob::OnReceivedSpdyResponseHeader( return OK; } -void WebSocketJob::OnSentSpdyData(int amount_sent) { +void WebSocketJob::OnSentSpdyData(size_t bytes_sent) { DCHECK_NE(INITIALIZED, state_); DCHECK_NE(CONNECTING, state_); if (state_ == CLOSED) return; if (!spdy_websocket_stream_.get()) return; - OnSentData(socket_, amount_sent); + OnSentData(socket_, static_cast<int>(bytes_sent)); } void WebSocketJob::OnReceivedSpdyData(const char* data, int length) { |