Bug 928304 Add jsonifier to mozRTCIceCandidate to simplify passing the candidate via signalling. r=jib
authorMark Banner <bugzilla@standard8.plus.com>
Mon, 21 Oct 2013 21:56:07 +0100
changeset 151607 2f50c6ff812491e54064086b6b94ac71b992ec94
parent 151606 458a9239016089b153d4a35e737512c87e3b0f7a
child 151608 358f2e245f45f1c3ead867b6264766ed6598d8e3
push id1
push userroot
push dateMon, 20 Oct 2014 17:29:22 +0000
reviewersjib
bugs928304
milestone27.0a1
Bug 928304 Add jsonifier to mozRTCIceCandidate to simplify passing the candidate via signalling. r=jib
dom/media/tests/mochitest/test_peerConnection_toJSON.html
dom/webidl/RTCIceCandidate.webidl
--- a/dom/media/tests/mochitest/test_peerConnection_toJSON.html
+++ b/dom/media/tests/mochitest/test_peerConnection_toJSON.html
@@ -1,34 +1,46 @@
 <!DOCTYPE HTML>
 <html>
 <!--
 https://bugzilla.mozilla.org/show_bug.cgi?id=872377
 -->
 <head>
   <meta charset="utf-8">
-  <title>Test for Bug 872377</title>
+  <title>Test for Bug 872377 and Bug 928304</title>
   <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
   <script type="application/javascript">
 
   /** Test for Bug 872377 **/
 
   var rtcSession = new mozRTCSessionDescription({ sdp: "Picklechips!",
                                                   type: "offer" });
   var jsonCopy = JSON.parse(JSON.stringify(rtcSession));
   for (key in rtcSession) {
     if (typeof(rtcSession[key]) == "function") continue;
     is(rtcSession[key], jsonCopy[key], "key " + key + " should match.");
   }
 
+  /** Test for Bug 928304 **/
+
+  var rtcIceCandidate = new mozRTCIceCandidate({ candidate: "dummy",
+                                                 sdpMid: "test",
+                                                 sdpMLineIndex: 3 });
+  jsonCopy = JSON.parse(JSON.stringify(rtcIceCandidate));
+  for (key in rtcIceCandidate) {
+    if (typeof(rtcIceCandidate[key]) == "function") continue;
+    is(rtcIceCandidate[key], jsonCopy[key], "key " + key + " should match.");
+  }
+
   </script>
 </head>
 <body>
 <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=872377">Mozilla Bug 872377</a>
+<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=928304">Mozilla Bug 928304</a>
 <p id="display"></p>
 <div id="content" style="display: none">
 
 </div>
 <pre id="test">
 </pre>
 </body>
 </html>
--- a/dom/webidl/RTCIceCandidate.webidl
+++ b/dom/webidl/RTCIceCandidate.webidl
@@ -16,12 +16,10 @@ dictionary RTCIceCandidateInit {
 [Pref="media.peerconnection.enabled",
  JSImplementation="@mozilla.org/dom/rtcicecandidate;1",
  Constructor(optional RTCIceCandidateInit candidateInitDict)]
 interface mozRTCIceCandidate {
   attribute DOMString?      candidate;
   attribute DOMString?      sdpMid;
   attribute unsigned short? sdpMLineIndex;
 
-  // Bug 863402 serializer support
-  //
-  //serializer = {attribute};
+  jsonifier;
 };