| Index: remoting/jingle_glue/ssl_socket_adapter.h
|
| diff --git a/remoting/jingle_glue/ssl_socket_adapter.h b/remoting/jingle_glue/ssl_socket_adapter.h
|
| index dee1d18d58764a14ce26f9163e4f79ca30120b84..9d32911bba66b9e32dd60a10d9ea277a60203178 100644
|
| --- a/remoting/jingle_glue/ssl_socket_adapter.h
|
| +++ b/remoting/jingle_glue/ssl_socket_adapter.h
|
| @@ -116,17 +116,14 @@ class SSLSocketAdapter : public talk_base::SSLAdapter {
|
| SSLSTATE_NONE,
|
| SSLSTATE_WAIT,
|
| SSLSTATE_CONNECTED,
|
| - };
|
| -
|
| - enum IOState {
|
| - IOSTATE_NONE,
|
| - IOSTATE_PENDING,
|
| - IOSTATE_COMPLETE,
|
| + SSLSTATE_ERROR,
|
| };
|
|
|
| void OnConnected(int result);
|
| void OnRead(int result);
|
| - void OnWrite(int result);
|
| + void OnWritten(int result);
|
| +
|
| + void DoWrite();
|
|
|
| virtual void OnConnectEvent(talk_base::AsyncSocket* socket) OVERRIDE;
|
|
|
| @@ -142,10 +139,12 @@ class SSLSocketAdapter : public talk_base::SSLAdapter {
|
| scoped_ptr<net::SSLClientSocket> ssl_socket_;
|
|
|
| SSLState ssl_state_;
|
| - IOState read_state_;
|
| - IOState write_state_;
|
| - scoped_refptr<net::IOBuffer> transport_buf_;
|
| - int data_transferred_;
|
| +
|
| + bool read_pending_;
|
| + scoped_refptr<net::GrowableIOBuffer> read_buffer_;
|
| +
|
| + bool write_pending_;
|
| + scoped_refptr<net::DrainableIOBuffer> write_buffer_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(SSLSocketAdapter);
|
| };
|
|
|