| Index: net/spdy/spdy_stream.cc
|
| diff --git a/net/spdy/spdy_stream.cc b/net/spdy/spdy_stream.cc
|
| index 1059223085b70f46f81d5267b48dfc18f4fc1618..2b212071b9253eee4f5e097e20beaf1ed8cdd8d7 100644
|
| --- a/net/spdy/spdy_stream.cc
|
| +++ b/net/spdy/spdy_stream.cc
|
| @@ -273,9 +273,9 @@ void SpdyStream::IncreaseSendWindowSize(int32 delta_window_size) {
|
| send_window_size_ += delta_window_size;
|
|
|
| net_log_.AddEvent(
|
| - NetLog::TYPE_SPDY_STREAM_UPDATE_SEND_WINDOW,
|
| - base::Bind(&NetLogSpdyStreamWindowUpdateCallback,
|
| - stream_id_, delta_window_size, send_window_size_));
|
| + NetLog::TYPE_HTTP2_STREAM_UPDATE_SEND_WINDOW,
|
| + base::Bind(&NetLogSpdyStreamWindowUpdateCallback, stream_id_,
|
| + delta_window_size, send_window_size_));
|
|
|
| PossiblyResumeIfSendStalled();
|
| }
|
| @@ -298,9 +298,9 @@ void SpdyStream::DecreaseSendWindowSize(int32 delta_window_size) {
|
| send_window_size_ -= delta_window_size;
|
|
|
| net_log_.AddEvent(
|
| - NetLog::TYPE_SPDY_STREAM_UPDATE_SEND_WINDOW,
|
| - base::Bind(&NetLogSpdyStreamWindowUpdateCallback,
|
| - stream_id_, -delta_window_size, send_window_size_));
|
| + NetLog::TYPE_HTTP2_STREAM_UPDATE_SEND_WINDOW,
|
| + base::Bind(&NetLogSpdyStreamWindowUpdateCallback, stream_id_,
|
| + -delta_window_size, send_window_size_));
|
| }
|
|
|
| void SpdyStream::OnReadBufferConsumed(
|
| @@ -328,9 +328,9 @@ void SpdyStream::IncreaseRecvWindowSize(int32 delta_window_size) {
|
|
|
| recv_window_size_ += delta_window_size;
|
| net_log_.AddEvent(
|
| - NetLog::TYPE_SPDY_STREAM_UPDATE_RECV_WINDOW,
|
| - base::Bind(&NetLogSpdyStreamWindowUpdateCallback,
|
| - stream_id_, delta_window_size, recv_window_size_));
|
| + NetLog::TYPE_HTTP2_STREAM_UPDATE_RECV_WINDOW,
|
| + base::Bind(&NetLogSpdyStreamWindowUpdateCallback, stream_id_,
|
| + delta_window_size, recv_window_size_));
|
|
|
| unacked_recv_window_bytes_ += delta_window_size;
|
| if (unacked_recv_window_bytes_ >
|
| @@ -360,9 +360,9 @@ void SpdyStream::DecreaseRecvWindowSize(int32 delta_window_size) {
|
|
|
| recv_window_size_ -= delta_window_size;
|
| net_log_.AddEvent(
|
| - NetLog::TYPE_SPDY_STREAM_UPDATE_RECV_WINDOW,
|
| - base::Bind(&NetLogSpdyStreamWindowUpdateCallback,
|
| - stream_id_, -delta_window_size, recv_window_size_));
|
| + NetLog::TYPE_HTTP2_STREAM_UPDATE_RECV_WINDOW,
|
| + base::Bind(&NetLogSpdyStreamWindowUpdateCallback, stream_id_,
|
| + -delta_window_size, recv_window_size_));
|
| }
|
|
|
| int SpdyStream::GetPeerAddress(IPEndPoint* address) const {
|
| @@ -615,9 +615,9 @@ SpdyMajorVersion SpdyStream::GetProtocolVersion() const {
|
| }
|
|
|
| void SpdyStream::LogStreamError(int status, const std::string& description) {
|
| - net_log_.AddEvent(NetLog::TYPE_SPDY_STREAM_ERROR,
|
| - base::Bind(&NetLogSpdyStreamErrorCallback,
|
| - stream_id_, status, &description));
|
| + net_log_.AddEvent(NetLog::TYPE_HTTP2_STREAM_ERROR,
|
| + base::Bind(&NetLogSpdyStreamErrorCallback, stream_id_,
|
| + status, &description));
|
| }
|
|
|
| void SpdyStream::OnClose(int status) {
|
| @@ -709,9 +709,8 @@ void SpdyStream::PossiblyResumeIfSendStalled() {
|
| }
|
| if (send_stalled_by_flow_control_ && !session_->IsSendStalled() &&
|
| send_window_size_ > 0) {
|
| - net_log_.AddEvent(
|
| - NetLog::TYPE_SPDY_STREAM_FLOW_CONTROL_UNSTALLED,
|
| - NetLog::IntegerCallback("stream_id", stream_id_));
|
| + net_log_.AddEvent(NetLog::TYPE_HTTP2_STREAM_FLOW_CONTROL_UNSTALLED,
|
| + NetLog::IntegerCallback("stream_id", stream_id_));
|
| send_stalled_by_flow_control_ = false;
|
| QueueNextDataFrame();
|
| }
|
|
|