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

Unified Diff: Source/modules/mediastream/RTCSessionDescription.cpp

Issue 1010393002: Fix issue of localDescription and remoteDescription getter. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: ActiveDomObject. Created 5 years, 8 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: Source/modules/mediastream/RTCSessionDescription.cpp
diff --git a/Source/modules/mediastream/RTCSessionDescription.cpp b/Source/modules/mediastream/RTCSessionDescription.cpp
index 60db5834b2ef203bd7b5ca52a646fb6c06077304..587dbf474f9ab3bf18f8fbf4ded1853ddc8f602b 100644
--- a/Source/modules/mediastream/RTCSessionDescription.cpp
+++ b/Source/modules/mediastream/RTCSessionDescription.cpp
@@ -37,7 +37,7 @@
namespace blink {
-RTCSessionDescription* RTCSessionDescription::create(const RTCSessionDescriptionInit& descriptionInitDict)
+RTCSessionDescription* RTCSessionDescription::create(ExecutionContext* context, const RTCSessionDescriptionInit& descriptionInitDict)
{
String type;
if (descriptionInitDict.hasType())
@@ -47,16 +47,17 @@ RTCSessionDescription* RTCSessionDescription::create(const RTCSessionDescription
if (descriptionInitDict.hasSdp())
sdp = descriptionInitDict.sdp();
- return new RTCSessionDescription(WebRTCSessionDescription(type, sdp));
+ return new RTCSessionDescription(context, WebRTCSessionDescription(type, sdp));
}
-RTCSessionDescription* RTCSessionDescription::create(WebRTCSessionDescription webSessionDescription)
+RTCSessionDescription* RTCSessionDescription::create(ExecutionContext* context, WebRTCSessionDescription webSessionDescription)
{
- return new RTCSessionDescription(webSessionDescription);
+ return new RTCSessionDescription(context, webSessionDescription);
}
-RTCSessionDescription::RTCSessionDescription(WebRTCSessionDescription webSessionDescription)
- : m_webSessionDescription(webSessionDescription)
+RTCSessionDescription::RTCSessionDescription(ExecutionContext* context, WebRTCSessionDescription webSessionDescription)
+ : ActiveDOMObject(context)
+ , m_webSessionDescription(webSessionDescription)
{
}
@@ -99,4 +100,23 @@ WebRTCSessionDescription RTCSessionDescription::webSessionDescription()
return m_webSessionDescription;
}
+void RTCSessionDescription::setWebSessionDescription(WebRTCSessionDescription webSessionDescription)
+{
+ m_webSessionDescription = webSessionDescription;
+}
+
+bool RTCSessionDescription::hasPendingActivity() const
+{
+ return false;
jochen (gone - plz use gerrit) 2015/04/22 14:48:40 hasPendingActivity should return true as long as t
changbin 2015/04/24 09:22:33 Then one factor that determines RTCSessionDescript
+}
+
+void RTCSessionDescription::stop()
+{
+}
+
+DEFINE_TRACE(RTCSessionDescription)
+{
+ ActiveDOMObject::trace(visitor);
+}
+
} // namespace blink

Powered by Google App Engine
This is Rietveld 408576698