| Index: device/serial/serial_io_handler_posix.cc
|
| diff --git a/device/serial/serial_io_handler_posix.cc b/device/serial/serial_io_handler_posix.cc
|
| index 704a4bf076b3e70fce7d21f1c79d44fb5403ab11..bf5b8083b4fe42211cbb9a5b6b4348a771a9ed4e 100644
|
| --- a/device/serial/serial_io_handler_posix.cc
|
| +++ b/device/serial/serial_io_handler_posix.cc
|
| @@ -120,7 +120,7 @@ scoped_refptr<SerialIoHandler> SerialIoHandler::Create(
|
| }
|
|
|
| void SerialIoHandlerPosix::ReadImpl() {
|
| - DCHECK(CalledOnValidThread());
|
| + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
| DCHECK(pending_read_buffer());
|
| DCHECK(file().IsValid());
|
|
|
| @@ -132,7 +132,7 @@ void SerialIoHandlerPosix::ReadImpl() {
|
| }
|
|
|
| void SerialIoHandlerPosix::WriteImpl() {
|
| - DCHECK(CalledOnValidThread());
|
| + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
| DCHECK(pending_write_buffer());
|
| DCHECK(file().IsValid());
|
|
|
| @@ -140,13 +140,13 @@ void SerialIoHandlerPosix::WriteImpl() {
|
| }
|
|
|
| void SerialIoHandlerPosix::CancelReadImpl() {
|
| - DCHECK(CalledOnValidThread());
|
| + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
| file_read_watcher_.reset();
|
| QueueReadCompleted(0, read_cancel_reason());
|
| }
|
|
|
| void SerialIoHandlerPosix::CancelWriteImpl() {
|
| - DCHECK(CalledOnValidThread());
|
| + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
| file_write_watcher_.reset();
|
| QueueWriteCompleted(0, write_cancel_reason());
|
| }
|
| @@ -300,7 +300,7 @@ SerialIoHandlerPosix::~SerialIoHandlerPosix() {
|
| }
|
|
|
| void SerialIoHandlerPosix::AttemptRead(bool within_read) {
|
| - DCHECK(CalledOnValidThread());
|
| + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
|
|
| if (pending_read_buffer()) {
|
| int bytes_read = HANDLE_EINTR(read(file().GetPlatformFile(),
|
| @@ -357,7 +357,7 @@ void SerialIoHandlerPosix::RunReadCompleted(bool within_read,
|
| }
|
|
|
| void SerialIoHandlerPosix::OnFileCanWriteWithoutBlocking() {
|
| - DCHECK(CalledOnValidThread());
|
| + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
|
|
| if (pending_write_buffer()) {
|
| int bytes_written = HANDLE_EINTR(write(file().GetPlatformFile(),
|
| @@ -376,7 +376,7 @@ void SerialIoHandlerPosix::OnFileCanWriteWithoutBlocking() {
|
| }
|
|
|
| void SerialIoHandlerPosix::EnsureWatchingReads() {
|
| - DCHECK(CalledOnValidThread());
|
| + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
| DCHECK(file().IsValid());
|
| if (!file_read_watcher_) {
|
| file_read_watcher_ = base::FileDescriptorWatcher::WatchReadable(
|
| @@ -386,7 +386,7 @@ void SerialIoHandlerPosix::EnsureWatchingReads() {
|
| }
|
|
|
| void SerialIoHandlerPosix::EnsureWatchingWrites() {
|
| - DCHECK(CalledOnValidThread());
|
| + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
| DCHECK(file().IsValid());
|
| if (!file_write_watcher_) {
|
| file_write_watcher_ = base::FileDescriptorWatcher::WatchWritable(
|
|
|