third_party/mojo/src/mojo/public/cpp/bindings/lib/connector.cc - Issue 1179733005: Update mojo sdk to rev bdbb0c7e396fc4044a8b194058d7a7e529715286

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1179733005: Update mojo sdk to rev bdbb0c7e396fc4044a8b194058d7a7e529715286 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: update CommandBufferImpl (Binding::OnConnectionError is no more) Created 5 years, 6 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

« no previous file with comments | « third_party/mojo/src/mojo/public/cpp/bindings/lib/connector.h ('k') | third_party/mojo/src/mojo/public/cpp/bindings/lib/interface_ptr_internal.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 89499dccce9d11f8ad31a05b7d341f6db1253404..24d993d12865f4fb5b33fba537903b20daeba34a 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

@@ -14,8 +14,7 @@ namespace internal {

Connector::Connector(ScopedMessagePipeHandle message_pipe,

const MojoAsyncWaiter* waiter)

- : error_handler_(nullptr),

- waiter_(waiter),

+ : waiter_(waiter),

message_pipe_(message_pipe.Pass()),

incoming_receiver_(nullptr),

async_wait_id_(0),

@@ -198,8 +197,7 @@ void Connector::CancelWait() {

void Connector::NotifyError() {

error_ = true;

CloseMessagePipe();

- if (error_handler_)

- error_handler_->OnConnectionError();

+ connection_error_handler_.Run();

}

} // namespace internal