Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(210)

Unified Diff: remoting/protocol/buffered_socket_writer.cc

Issue 6282006: Add a done task to ScreenRecorder::Stop() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: ready now Created 9 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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(&current_packet, &current_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(&current_packet, &current_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;
}
« remoting/protocol/buffered_socket_writer.h ('K') | « remoting/protocol/buffered_socket_writer.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698