| Index: webrtc/p2p/base/session.cc
|
| diff --git a/webrtc/p2p/base/session.cc b/webrtc/p2p/base/session.cc
|
| index 55b1d90c1a811563a69f9793ae04fff1f6886054..ca0525dd852afb04e85236555eaee982192237bf 100644
|
| --- a/webrtc/p2p/base/session.cc
|
| +++ b/webrtc/p2p/base/session.cc
|
| @@ -582,7 +582,6 @@ void BaseSession::SetState(State state) {
|
| SignalState(this, state_);
|
| signaling_thread_->Post(this, MSG_STATE);
|
| }
|
| - SignalNewDescription();
|
| }
|
|
|
| void BaseSession::SetError(Error error, const std::string& error_desc) {
|
| @@ -787,54 +786,6 @@ bool BaseSession::GetTransportDescription(const SessionDescription* description,
|
| return true;
|
| }
|
|
|
| -void BaseSession::SignalNewDescription() {
|
| - ContentAction action;
|
| - ContentSource source;
|
| - if (!GetContentAction(&action, &source)) {
|
| - return;
|
| - }
|
| - if (source == CS_LOCAL) {
|
| - SignalNewLocalDescription(this, action);
|
| - } else {
|
| - SignalNewRemoteDescription(this, action);
|
| - }
|
| -}
|
| -
|
| -bool BaseSession::GetContentAction(ContentAction* action,
|
| - ContentSource* source) {
|
| - switch (state_) {
|
| - // new local description
|
| - case STATE_SENTINITIATE:
|
| - *action = CA_OFFER;
|
| - *source = CS_LOCAL;
|
| - break;
|
| - case STATE_SENTPRACCEPT:
|
| - *action = CA_PRANSWER;
|
| - *source = CS_LOCAL;
|
| - break;
|
| - case STATE_SENTACCEPT:
|
| - *action = CA_ANSWER;
|
| - *source = CS_LOCAL;
|
| - break;
|
| - // new remote description
|
| - case STATE_RECEIVEDINITIATE:
|
| - *action = CA_OFFER;
|
| - *source = CS_REMOTE;
|
| - break;
|
| - case STATE_RECEIVEDPRACCEPT:
|
| - *action = CA_PRANSWER;
|
| - *source = CS_REMOTE;
|
| - break;
|
| - case STATE_RECEIVEDACCEPT:
|
| - *action = CA_ANSWER;
|
| - *source = CS_REMOTE;
|
| - break;
|
| - default:
|
| - return false;
|
| - }
|
| - return true;
|
| -}
|
| -
|
| void BaseSession::OnMessage(rtc::Message *pmsg) {
|
| switch (pmsg->message_id) {
|
| case MSG_TIMEOUT:
|
|
|