Chromium Code Reviews| Index: remoting/protocol/buffered_socket_writer.cc |
| diff --git a/remoting/protocol/buffered_socket_writer.cc b/remoting/protocol/buffered_socket_writer.cc |
| index 11b8395a18235920871b90ffe7777780b007c4f1..48797e7c604eb395f42c48fd711d42dcc9432afa 100644 |
| --- a/remoting/protocol/buffered_socket_writer.cc |
| +++ b/remoting/protocol/buffered_socket_writer.cc |
| @@ -70,28 +70,28 @@ void BufferedSocketWriterBase::DoWrite() { |
| DCHECK_EQ(message_loop_, MessageLoop::current()); |
| DCHECK(socket_); |
| - // Don't try to write if there is another write pending. |
| - if (write_pending_) |
| - return; |
| - |
| - // Don't write after Close(). |
| - { |
| - AutoLock auto_lock(lock_); |
| - if (closed_) |
| - return; |
| - } |
| - |
| - while (true) { |
| - net::IOBuffer* current_packet; |
| - int current_packet_size; |
| - { |
| - AutoLock auto_lock(lock_); |
| - GetNextPacket_Locked(¤t_packet, ¤t_packet_size); |
| - } |
| - |
| - // Return if the queue is empty. |
| - if (!current_packet) |
| - return; |
| + // Don't try to write if there is another write pending. |
|
Sergey Ulanov
2011/01/20 19:14:17
Remove extra spaces
Alpha Left Google
2011/01/20 19:32:08
weird... done.
|
| + if (write_pending_) |
| + return; |
| + |
| + // Don't write after Close(). |
| + { |
| + AutoLock auto_lock(lock_); |
| + if (closed_) |
| + return; |
| + } |
| + |
| + while (true) { |
| + net::IOBuffer* current_packet; |
| + int current_packet_size; |
| + { |
| + AutoLock auto_lock(lock_); |
| + GetNextPacket_Locked(¤t_packet, ¤t_packet_size); |
| + } |
| + |
| + // Return if the queue is empty. |
| + if (!current_packet) |
| + return; |
| int result = socket_->Write(current_packet, current_packet_size, |
| &written_callback_); |
| @@ -103,8 +103,6 @@ void BufferedSocketWriterBase::DoWrite() { |
| write_pending_ = true; |
| } else { |
| HandleError(result); |
| - if (write_failed_callback_.get()) |
| - write_failed_callback_->Run(result); |
| } |
| return; |
| } |
| @@ -117,8 +115,6 @@ void BufferedSocketWriterBase::OnWritten(int result) { |
| if (result < 0) { |
| HandleError(result); |
| - if (write_failed_callback_.get()) |
| - write_failed_callback_->Run(result); |
| return; |
| } |