Change data pipe wrappers used by SerialConnection to use message pipe.

device/serial/data_receiver.h

Index: device/serial/data_receiver.h
diff --git a/device/serial/data_receiver.h b/device/serial/data_receiver.h
index df370180de7bbe11d2908eee06288142d4a33424..3a6c1ca90662161ec1a7e54b5ab31f5d93ec1aac 100644
--- a/device/serial/data_receiver.h
+++ b/device/serial/data_receiver.h
@@ -5,7 +5,10 @@
 #ifndef DEVICE_SERIAL_DATA_RECEIVER_H_
 #define DEVICE_SERIAL_DATA_RECEIVER_H_
 
+#include <queue>
+
 #include "base/callback.h"
+#include "base/memory/linked_ptr.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "device/serial/buffer.h"
@@ -14,8 +17,6 @@
 
 namespace device {
 
-class AsyncWaiter;
-
 // A DataReceiver receives data from a DataSource.
 class DataReceiver : public base::RefCounted<DataReceiver>,
                      public serial::DataSourceClient,
@@ -24,9 +25,9 @@ class DataReceiver : public base::RefCounted<DataReceiver>,
   typedef base::Callback<void(scoped_ptr<ReadOnlyBuffer>)> ReceiveDataCallback;
   typedef base::Callback<void(int32_t error)> ReceiveErrorCallback;
 
-  // Constructs a DataReceiver to receive data from |source|, using a data
-  // pipe with a buffer size of |buffer_size|, with connection errors reported
-  // as |fatal_error_value|.
+  // Constructs a DataReceiver to receive data from |source|, using a buffer
+  // size of |buffer_size|, with connection errors reported as
+  // |fatal_error_value|.
   DataReceiver(mojo::InterfacePtr<serial::DataSource> source,
                uint32_t buffer_size,
                int32_t fatal_error_value);
@@ -40,14 +41,16 @@ class DataReceiver : public base::RefCounted<DataReceiver>,
 
  private:
   class PendingReceive;
-  struct PendingError;
+  struct DataFrame;
   friend class base::RefCounted<DataReceiver>;
 
   virtual ~DataReceiver();
 
-  // serial::DataSourceClient override. Invoked by the DataSource to report
-  // errors.
-  virtual void OnError(uint32_t bytes_since_last_error, int32_t error) override;
+  // serial::DataSourceClient overrides.
+  // Invoked by the DataSource to report errors.
+  virtual void OnError(int32_t error) override;
+  // Invoked by the DataSource transmit data.
+  virtual void OnData(mojo::Array<uint8_t> data) override;
 
   // mojo::ErrorHandler override. Calls ShutDown().
   virtual void OnConnectionError() override;
@@ -56,10 +59,6 @@ class DataReceiver : public base::RefCounted<DataReceiver>,
   // receive buffer, having read |bytes_read| bytes from it.
   void Done(uint32_t bytes_read);
 
-  // Invoked when |handle_| is ready to read. Unless an error has occurred, this
-  // calls ReceiveInternal().
-  void OnDoneWaiting(MojoResult result);
-
   // The implementation of Receive(). If a |pending_error_| is ready to
   // dispatch, it does so. Otherwise, this attempts to read from |handle_| and
   // dispatches the contents to |pending_receive_|. If |handle_| is not ready,
@@ -67,13 +66,6 @@ class DataReceiver : public base::RefCounted<DataReceiver>,
   // |handle_|, ShutDown() is called.
   void ReceiveInternal();
 
-  // We may have been notified of an error that occurred at some future point in
-  // the stream. We should never be able to read past the point at which the
-  // error occurred until we have dealt with the error and called Resume() on
-  // the DataSource. If this has occurred, something bad has happened on the
-  // service side, so we shut down.
-  bool CheckErrorNotInReadRange(uint32_t num_bytes);
-
   // Called when we encounter a fatal error. If a receive is in progress,
   // |fatal_error_value_| will be reported to the user.
   void ShutDown();
@@ -81,26 +73,17 @@ class DataReceiver : public base::RefCounted<DataReceiver>,
   // The control connection to the data source.
   mojo::InterfacePtr<serial::DataSource> source_;
 
-  // The data connection to the data source.
-  mojo::ScopedDataPipeConsumerHandle handle_;
-
   // The error value to report in the event of a fatal error.
   const int32_t fatal_error_value_;
 
-  // The number of bytes received from the data source.
-  uint32_t bytes_received_;
-
   // Whether we have encountered a fatal error and shut down.
   bool shut_down_;
 
-  // A waiter used to wait until |handle_| is readable if we are waiting.
-  scoped_ptr<AsyncWaiter> waiter_;
-
   // The current pending receive operation if there is one.
   scoped_ptr<PendingReceive> pending_receive_;
 
-  // The current pending error if there is one.
-  scoped_ptr<PendingError> pending_error_;
+  // The queue of pending data buffers received from the DataSource.
+  std::queue<linked_ptr<DataFrame>> pending_data_buffers_;

[raymes, 2014/10/27 03:02:22]

Should we call it pending_data_frames_? And update the comment?

[Sam McNally, 2014/10/27 05:39:14]

Done.

 
   base::WeakPtrFactory<DataReceiver> weak_factory_;