Chromium Code Reviews| Index: blimp/net/stream_packet_writer.cc |
| diff --git a/blimp/net/stream_packet_writer.cc b/blimp/net/stream_packet_writer.cc |
| index 221cdd170e7fa87eb5b0f31742de8e8b9591f4f8..cf5c2c87e76f15f8a25baefbcc34e7374e800c1a 100644 |
| --- a/blimp/net/stream_packet_writer.cc |
| +++ b/blimp/net/stream_packet_writer.cc |
| @@ -47,15 +47,11 @@ StreamPacketWriter::StreamPacketWriter(net::StreamSocket* socket) |
| StreamPacketWriter::~StreamPacketWriter() {} |
| -int StreamPacketWriter::WritePacket(scoped_refptr<net::DrainableIOBuffer> data, |
| - const net::CompletionCallback& callback) { |
| +void StreamPacketWriter::WritePacket(scoped_refptr<net::DrainableIOBuffer> data, |
| + const net::CompletionCallback& callback) { |
| DCHECK_EQ(WriteState::IDLE, write_state_); |
| DCHECK(data); |
| - if (data->BytesRemaining() == 0) { |
| - // The packet is empty; your argument is invalid. |
| - DLOG(ERROR) << "Attempted to write zero-length packet."; |
| - return net::ERR_INVALID_ARGUMENT; |
| - } |
| + DCHECK(data->BytesRemaining()); |
|
Wez
2015/11/25 02:21:28
CHECK(data->BytesRemaining()), so that release bui
Kevin M
2015/11/30 19:25:14
Done.
|
| write_state_ = WriteState::HEADER; |
| header_buffer_->SetOffset(0); |
| @@ -63,18 +59,18 @@ int StreamPacketWriter::WritePacket(scoped_refptr<net::DrainableIOBuffer> data, |
| base::HostToNet32(data->BytesRemaining()); |
| payload_buffer_ = data; |
| - int result = DoWriteLoop(false); |
| - if (result == net::ERR_IO_PENDING) { |
| - // Store the completion callback to invoke when DoWriteLoop completes |
| - // asynchronously. |
| - callback_ = callback; |
| - } else { |
| + int result = DoWriteLoop(net::OK); |
| + if (result != net::ERR_IO_PENDING) { |
| // Release the payload buffer, since the write operation has completed |
| // synchronously. |
| payload_buffer_ = nullptr; |
| - } |
| - return result; |
| + // Adapt synchronous completion to an asynchronous style. |
| + base::MessageLoop::current()->PostTask(FROM_HERE, |
| + base::Bind(callback, result)); |
| + } else { |
| + callback_ = callback; |
| + } |
| } |
| int StreamPacketWriter::DoWriteLoop(int result) { |