Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(269)

Unified Diff: webrtc/p2p/base/transportchannel.h

Issue 1345913004: Replace readable with receiving where receiving means receiving anything (stun ping, response or da… (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master
Patch Set: Address comments Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/p2p/base/transport.cc ('k') | webrtc/p2p/base/transportchannel.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/p2p/base/transportchannel.h
diff --git a/webrtc/p2p/base/transportchannel.h b/webrtc/p2p/base/transportchannel.h
index f492e4e000ee5d27bc0e7dd3c47df6c6ca6e8fa0..f195a0edc2f01211187f4c77ea737abdcb188ccb 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;
@@ -139,8 +137,8 @@ class TransportChannel : public sigslot::has_slots<> {
std::string ToString() const;
protected:
- // Sets the readable state, signaling if necessary.
- void set_readable(bool readable);
+ // TODO(honghaiz): Remove this once chromium's unit tests no longer call it.
+ void set_readable(bool readable) { set_receiving(readable); }
// Sets the writable state, signaling if necessary.
void set_writable(bool writable);
@@ -153,7 +151,6 @@ class TransportChannel : public sigslot::has_slots<> {
// Used mostly for debugging.
std::string content_name_;
int component_;
- bool readable_;
bool writable_;
bool receiving_;
« no previous file with comments | « webrtc/p2p/base/transport.cc ('k') | webrtc/p2p/base/transportchannel.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698