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

Unified Diff: talk/app/webrtc/webrtcsessiondescriptionfactory.cc

Issue 1397973002: Merging BaseSession code into WebRtcSession. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Removing obsolete unit test. Created 5 years, 2 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: talk/app/webrtc/webrtcsessiondescriptionfactory.cc
diff --git a/talk/app/webrtc/webrtcsessiondescriptionfactory.cc b/talk/app/webrtc/webrtcsessiondescriptionfactory.cc
index 876931539a96e22e5b1a2bfa5803d0fe81c3dd7f..06130acd6caa54c3e0e7be7d7dbeb496611da611 100644
--- a/talk/app/webrtc/webrtcsessiondescriptionfactory.cc
+++ b/talk/app/webrtc/webrtcsessiondescriptionfactory.cc
@@ -403,10 +403,8 @@ void WebRtcSessionDescriptionFactory::OnMessage(rtc::Message* msg) {
void WebRtcSessionDescriptionFactory::InternalCreateOffer(
CreateSessionDescriptionRequest request) {
- cricket::SessionDescription* desc(
- session_desc_factory_.CreateOffer(
- request.options,
- static_cast<cricket::BaseSession*>(session_)->local_description()));
+ cricket::SessionDescription* desc(session_desc_factory_.CreateOffer(
+ request.options, session_->base_local_description()));
// RFC 3264
// When issuing an offer that modifies the session,
// the "o=" line of the new SDP MUST be identical to that in the
@@ -450,9 +448,8 @@ void WebRtcSessionDescriptionFactory::InternalCreateAnswer(
}
cricket::SessionDescription* desc(session_desc_factory_.CreateAnswer(
- static_cast<cricket::BaseSession*>(session_)->remote_description(),
- request.options,
- static_cast<cricket::BaseSession*>(session_)->local_description()));
+ session_->base_remote_description(), request.options,
+ session_->base_local_description()));
// RFC 3264
// If the answer is different from the offer in any way (different IP
// addresses, ports, etc.), the origin line MUST be different in the answer.

Powered by Google App Engine
This is Rietveld 408576698