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

Unified Diff: webrtc/p2p/base/transport.cc

Issue 1351673003: 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: One line comment change in the dtlstransportchannel.cc 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
Index: webrtc/p2p/base/transport.cc
diff --git a/webrtc/p2p/base/transport.cc b/webrtc/p2p/base/transport.cc
index 5f28c40e936d02e258957a22997ed485e85134ba..8cb124eea02378818188dc41cfaac7821cf77986 100644
--- a/webrtc/p2p/base/transport.cc
+++ b/webrtc/p2p/base/transport.cc
@@ -106,7 +106,6 @@ Transport::Transport(rtc::Thread* signaling_thread,
content_name_(content_name),
allocator_(allocator),
destroyed_(false),
- readable_(TRANSPORT_STATE_NONE),
writable_(TRANSPORT_STATE_NONE),
receiving_(TRANSPORT_STATE_NONE),
was_writable_(false),
@@ -238,7 +237,6 @@ TransportChannelImpl* Transport::CreateChannel_w(int component) {
if (local_description_ && remote_description_)
ApplyNegotiatedTransportDescription_w(impl, NULL);
- impl->SignalReadableState.connect(this, &Transport::OnChannelReadableState);
impl->SignalWritableState.connect(this, &Transport::OnChannelWritableState);
impl->SignalReceivingState.connect(this, &Transport::OnChannelReceivingState);
impl->SignalRequestSignaling.connect(
@@ -493,20 +491,6 @@ void Transport::OnRemoteCandidate_w(const Candidate& candidate) {
}
}
-void Transport::OnChannelReadableState(TransportChannel* channel) {
- ASSERT(worker_thread()->IsCurrent());
- signaling_thread()->Post(this, MSG_READSTATE, NULL);
-}
-
-void Transport::OnChannelReadableState_s() {
- ASSERT(signaling_thread()->IsCurrent());
- TransportState readable = GetTransportState_s(TRANSPORT_READABLE_STATE);
- if (readable_ != readable) {
- readable_ = readable;
- SignalReadableState(this);
- }
-}
-
void Transport::OnChannelWritableState(TransportChannel* channel) {
ASSERT(worker_thread()->IsCurrent());
signaling_thread()->Post(this, MSG_WRITESTATE, NULL);
@@ -547,9 +531,6 @@ TransportState Transport::GetTransportState_s(TransportStateType state_type) {
for (const auto iter : channels_) {
bool b = false;
switch (state_type) {
- case TRANSPORT_READABLE_STATE:
- b = iter.second->readable();
- break;
case TRANSPORT_WRITABLE_STATE:
b = iter.second->writable();
break;
@@ -870,9 +851,6 @@ void Transport::OnMessage(rtc::Message* msg) {
case MSG_CONNECTING:
OnConnecting_s();
break;
- case MSG_READSTATE:
- OnChannelReadableState_s();
- break;
case MSG_WRITESTATE:
OnChannelWritableState_s();
break;

Powered by Google App Engine
This is Rietveld 408576698