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

Unified Diff: third_party/mojo/src/mojo/public/cpp/bindings/lib/connector.cc

Issue 1127293003: Update mojo sdk to rev f84766d3b6420b7cf6a113d9d65d73cb5fe18d90 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: formatting Created 5 years, 7 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: third_party/mojo/src/mojo/public/cpp/bindings/lib/connector.cc
diff --git a/third_party/mojo/src/mojo/public/cpp/bindings/lib/connector.cc b/third_party/mojo/src/mojo/public/cpp/bindings/lib/connector.cc
index ebdcf38bdc3d7d248bac90c0cad4fe1f14e90554..89499dccce9d11f8ad31a05b7d341f6db1253404 100644
--- a/third_party/mojo/src/mojo/public/cpp/bindings/lib/connector.cc
+++ b/third_party/mojo/src/mojo/public/cpp/bindings/lib/connector.cc
@@ -62,11 +62,10 @@ bool Connector::WaitForIncomingMessage(MojoDeadline deadline) {
}
bool Connector::Accept(Message* message) {
- MOJO_CHECK(message_pipe_.is_valid());
-
if (error_)
return false;
+ MOJO_CHECK(message_pipe_.is_valid());
if (drop_writes_)
return true;
@@ -198,7 +197,7 @@ void Connector::CancelWait() {
void Connector::NotifyError() {
error_ = true;
- CancelWait();
+ CloseMessagePipe();
if (error_handler_)
error_handler_->OnConnectionError();
}

Powered by Google App Engine
This is Rietveld 408576698