| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "device/serial/serial_connection.h" | 5 #include "device/serial/serial_connection.h" |
| 6 | 6 |
| 7 #include <utility> |
| 8 |
| 7 #include "base/bind.h" | 9 #include "base/bind.h" |
| 8 #include "device/serial/buffer.h" | 10 #include "device/serial/buffer.h" |
| 9 #include "device/serial/data_sink_receiver.h" | 11 #include "device/serial/data_sink_receiver.h" |
| 10 #include "device/serial/data_source_sender.h" | 12 #include "device/serial/data_source_sender.h" |
| 11 #include "device/serial/serial_io_handler.h" | 13 #include "device/serial/serial_io_handler.h" |
| 12 | 14 |
| 13 namespace device { | 15 namespace device { |
| 14 | 16 |
| 15 SerialConnection::SerialConnection( | 17 SerialConnection::SerialConnection( |
| 16 scoped_refptr<SerialIoHandler> io_handler, | 18 scoped_refptr<SerialIoHandler> io_handler, |
| 17 mojo::InterfaceRequest<serial::DataSink> sink, | 19 mojo::InterfaceRequest<serial::DataSink> sink, |
| 18 mojo::InterfaceRequest<serial::DataSource> source, | 20 mojo::InterfaceRequest<serial::DataSource> source, |
| 19 mojo::InterfacePtr<serial::DataSourceClient> source_client, | 21 mojo::InterfacePtr<serial::DataSourceClient> source_client, |
| 20 mojo::InterfaceRequest<serial::Connection> request) | 22 mojo::InterfaceRequest<serial::Connection> request) |
| 21 : io_handler_(io_handler), binding_(this, request.Pass()) { | 23 : io_handler_(io_handler), binding_(this, std::move(request)) { |
| 22 receiver_ = new DataSinkReceiver( | 24 receiver_ = new DataSinkReceiver( |
| 23 sink.Pass(), | 25 std::move(sink), |
| 24 base::Bind(&SerialConnection::OnSendPipeReady, base::Unretained(this)), | 26 base::Bind(&SerialConnection::OnSendPipeReady, base::Unretained(this)), |
| 25 base::Bind(&SerialConnection::OnSendCancelled, base::Unretained(this)), | 27 base::Bind(&SerialConnection::OnSendCancelled, base::Unretained(this)), |
| 26 base::Bind(base::DoNothing)); | 28 base::Bind(base::DoNothing)); |
| 27 sender_ = new DataSourceSender( | 29 sender_ = new DataSourceSender( |
| 28 source.Pass(), source_client.Pass(), | 30 std::move(source), std::move(source_client), |
| 29 base::Bind(&SerialConnection::OnReceivePipeReady, base::Unretained(this)), | 31 base::Bind(&SerialConnection::OnReceivePipeReady, base::Unretained(this)), |
| 30 base::Bind(base::DoNothing)); | 32 base::Bind(base::DoNothing)); |
| 31 } | 33 } |
| 32 | 34 |
| 33 SerialConnection::~SerialConnection() { | 35 SerialConnection::~SerialConnection() { |
| 34 receiver_->ShutDown(); | 36 receiver_->ShutDown(); |
| 35 sender_->ShutDown(); | 37 sender_->ShutDown(); |
| 36 io_handler_->CancelRead(serial::RECEIVE_ERROR_DISCONNECTED); | 38 io_handler_->CancelRead(serial::RECEIVE_ERROR_DISCONNECTED); |
| 37 io_handler_->CancelWrite(serial::SEND_ERROR_DISCONNECTED); | 39 io_handler_->CancelWrite(serial::SEND_ERROR_DISCONNECTED); |
| 38 } | 40 } |
| (...skipping 22 matching lines...) Expand all Loading... |
| 61 | 63 |
| 62 void SerialConnection::Flush(const mojo::Callback<void(bool)>& callback) { | 64 void SerialConnection::Flush(const mojo::Callback<void(bool)>& callback) { |
| 63 callback.Run(io_handler_->Flush()); | 65 callback.Run(io_handler_->Flush()); |
| 64 } | 66 } |
| 65 | 67 |
| 66 void SerialConnection::OnSendCancelled(int32_t error) { | 68 void SerialConnection::OnSendCancelled(int32_t error) { |
| 67 io_handler_->CancelWrite(static_cast<serial::SendError>(error)); | 69 io_handler_->CancelWrite(static_cast<serial::SendError>(error)); |
| 68 } | 70 } |
| 69 | 71 |
| 70 void SerialConnection::OnSendPipeReady(scoped_ptr<ReadOnlyBuffer> buffer) { | 72 void SerialConnection::OnSendPipeReady(scoped_ptr<ReadOnlyBuffer> buffer) { |
| 71 io_handler_->Write(buffer.Pass()); | 73 io_handler_->Write(std::move(buffer)); |
| 72 } | 74 } |
| 73 | 75 |
| 74 void SerialConnection::OnReceivePipeReady(scoped_ptr<WritableBuffer> buffer) { | 76 void SerialConnection::OnReceivePipeReady(scoped_ptr<WritableBuffer> buffer) { |
| 75 io_handler_->Read(buffer.Pass()); | 77 io_handler_->Read(std::move(buffer)); |
| 76 } | 78 } |
| 77 | 79 |
| 78 } // namespace device | 80 } // namespace device |
| OLD | NEW |