| Index: webrtc/p2p/base/transportchannel.h
|
| diff --git a/webrtc/p2p/base/transportchannel.h b/webrtc/p2p/base/transportchannel.h
|
| index 15b38eee84b34497546f0a8a093e18ef4199aeb1..91e8e983efa91af85db8d477fdf65e839b8efdd1 100644
|
| --- a/webrtc/p2p/base/transportchannel.h
|
| +++ b/webrtc/p2p/base/transportchannel.h
|
| @@ -46,7 +46,8 @@ class TransportChannel : public sigslot::has_slots<> {
|
| explicit TransportChannel(const std::string& content_name, int component)
|
| : content_name_(content_name),
|
| component_(component),
|
| - readable_(false), writable_(false), receiving_(false) {}
|
| + writable_(false),
|
| + receiving_(false) {}
|
| virtual ~TransportChannel() {}
|
|
|
| // TODO(guoweis) - Make this pure virtual once all subclasses of
|
| @@ -62,13 +63,10 @@ class TransportChannel : public sigslot::has_slots<> {
|
| const std::string& content_name() const { return content_name_; }
|
| int component() const { return component_; }
|
|
|
| - // Returns the readable and states of this channel. Each time one of these
|
| - // states changes, a signal is raised. These states are aggregated by the
|
| - // TransportManager.
|
| - bool readable() const { return readable_; }
|
| + // Returns the states of this channel. Each time one of these states changes,
|
| + // a signal is raised. These states are aggregated by the TransportManager.
|
| bool writable() const { return writable_; }
|
| bool receiving() const { return receiving_; }
|
| - sigslot::signal1<TransportChannel*> SignalReadableState;
|
| sigslot::signal1<TransportChannel*> SignalWritableState;
|
| // Emitted when the TransportChannel's ability to send has changed.
|
| sigslot::signal1<TransportChannel*> SignalReadyToSend;
|
| @@ -138,8 +136,6 @@ class TransportChannel : public sigslot::has_slots<> {
|
| std::string ToString() const;
|
|
|
| protected:
|
| - // Sets the readable state, signaling if necessary.
|
| - void set_readable(bool readable);
|
|
|
| // Sets the writable state, signaling if necessary.
|
| void set_writable(bool writable);
|
| @@ -152,7 +148,6 @@ class TransportChannel : public sigslot::has_slots<> {
|
| // Used mostly for debugging.
|
| std::string content_name_;
|
| int component_;
|
| - bool readable_;
|
| bool writable_;
|
| bool receiving_;
|
|
|
|
|