summaryrefslogtreecommitdiffstats
path: root/net/spdy/spdy_websocket_stream.cc
diff options
context:
space:
mode:
authorakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-15 00:21:42 +0000
committerakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-15 00:21:42 +0000
commitd46715c9e23b6a27a4f3484fa3c2f9e213c8ed14 (patch)
treea0619f483850b39c6bbb34e3e191ef4cb8f35059 /net/spdy/spdy_websocket_stream.cc
parentbf97e8bcd8225c395db813ecc0b0ed84194b0d04 (diff)
downloadchromium_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/spdy/spdy_websocket_stream.cc')
-rw-r--r--net/spdy/spdy_websocket_stream.cc15
1 files changed, 7 insertions, 8 deletions
diff --git a/net/spdy/spdy_websocket_stream.cc b/net/spdy/spdy_websocket_stream.cc
index f22d159..1f80d48 100644
--- a/net/spdy/spdy_websocket_stream.cc
+++ b/net/spdy/spdy_websocket_stream.cc
@@ -88,10 +88,10 @@ void SpdyWebSocketStream::Close() {
stream_->Close();
}
-bool SpdyWebSocketStream::OnSendHeadersComplete(int status) {
+SpdySendStatus SpdyWebSocketStream::OnSendHeadersComplete() {
DCHECK(delegate_);
- delegate_->OnSentSpdyHeaders(status);
- return true;
+ delegate_->OnSentSpdyHeaders();
+ return NO_MORE_DATA_TO_SEND;
}
int SpdyWebSocketStream::OnSendBody() {
@@ -99,10 +99,9 @@ int SpdyWebSocketStream::OnSendBody() {
return ERR_UNEXPECTED;
}
-int SpdyWebSocketStream::OnSendBodyComplete(int status, bool* eof) {
+SpdySendStatus SpdyWebSocketStream::OnSendBodyComplete(size_t bytes_sent) {
NOTREACHED();
- *eof = true;
- return ERR_UNEXPECTED;
+ return NO_MORE_DATA_TO_SEND;
}
int SpdyWebSocketStream::OnResponseReceived(
@@ -123,9 +122,9 @@ int SpdyWebSocketStream::OnDataReceived(const char* data, int length) {
return OK;
}
-void SpdyWebSocketStream::OnDataSent(int length) {
+void SpdyWebSocketStream::OnDataSent(size_t bytes_sent) {
DCHECK(delegate_);
- delegate_->OnSentSpdyData(length);
+ delegate_->OnSentSpdyData(bytes_sent);
}
void SpdyWebSocketStream::OnClose(int status) {