Bug 1184426 - Unprefix RTCIceCandidatePairStats.priority (formerly mozPriority). r=bwc, r=smaug
authorJan-Ivar Bruaroey <jib@mozilla.com>
Wed, 15 Jul 2015 22:43:37 -0400
changeset 253236 c00855009d2ecea780b5d44c0cf9d147f96a2fbd
parent 253235 59c2d8026df315b694db7ff1472a431b9c2d6abc
child 253237 ad33703526028cc16d5fe99a95841dec6ff57931
push id62386
push userryanvm@gmail.com
push dateThu, 16 Jul 2015 19:47:46 +0000
treeherdermozilla-inbound@c00855009d2e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbwc, smaug
bugs1184426
milestone42.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1184426 - Unprefix RTCIceCandidatePairStats.priority (formerly mozPriority). r=bwc, r=smaug
dom/media/webrtc/WebrtcGlobal.h
dom/webidl/RTCStatsReport.webidl
media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.cpp
toolkit/content/aboutwebrtc/aboutWebrtc.js
--- a/dom/media/webrtc/WebrtcGlobal.h
+++ b/dom/media/webrtc/WebrtcGlobal.h
@@ -193,30 +193,30 @@ template<>
 struct ParamTraits<mozilla::dom::RTCIceCandidatePairStats>
 {
   typedef mozilla::dom::RTCIceCandidatePairStats paramType;
 
   static void Write(Message* aMsg, const paramType& aParam)
   {
     WriteParam(aMsg, aParam.mComponentId);
     WriteParam(aMsg, aParam.mLocalCandidateId);
-    WriteParam(aMsg, aParam.mMozPriority);
+    WriteParam(aMsg, aParam.mPriority);
     WriteParam(aMsg, aParam.mNominated);
     WriteParam(aMsg, aParam.mReadable);
     WriteParam(aMsg, aParam.mRemoteCandidateId);
     WriteParam(aMsg, aParam.mSelected);
     WriteParam(aMsg, aParam.mState);
     WriteRTCStats(aMsg, aParam);
   }
 
   static bool Read(const Message* aMsg, void** aIter, paramType* aResult)
   {
     if (!ReadParam(aMsg, aIter, &(aResult->mComponentId)) ||
         !ReadParam(aMsg, aIter, &(aResult->mLocalCandidateId)) ||
-        !ReadParam(aMsg, aIter, &(aResult->mMozPriority)) ||
+        !ReadParam(aMsg, aIter, &(aResult->mPriority)) ||
         !ReadParam(aMsg, aIter, &(aResult->mNominated)) ||
         !ReadParam(aMsg, aIter, &(aResult->mReadable)) ||
         !ReadParam(aMsg, aIter, &(aResult->mRemoteCandidateId)) ||
         !ReadParam(aMsg, aIter, &(aResult->mSelected)) ||
         !ReadParam(aMsg, aIter, &(aResult->mState)) ||
         !ReadRTCStats(aMsg, aIter, aResult)) {
       return false;
     }
--- a/dom/webidl/RTCStatsReport.webidl
+++ b/dom/webidl/RTCStatsReport.webidl
@@ -110,17 +110,17 @@ enum RTCStatsIceCandidatePairState {
   "cancelled"
 };
 
 dictionary RTCIceCandidatePairStats : RTCStats {
   DOMString componentId;
   DOMString localCandidateId;
   DOMString remoteCandidateId;
   RTCStatsIceCandidatePairState state;
-  unsigned long long mozPriority;
+  unsigned long long priority;
   boolean readable;
   boolean nominated;
   boolean selected;
 };
 
 enum RTCStatsIceCandidateType {
   "host",
   "serverreflexive",
--- a/media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.cpp
+++ b/media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.cpp
@@ -3021,17 +3021,17 @@ static void RecordIceStats_s(
     RTCIceCandidatePairStats s;
     s.mId.Construct(codeword);
     s.mComponentId.Construct(componentId);
     s.mTimestamp.Construct(now);
     s.mType.Construct(RTCStatsType::Candidatepair);
     s.mLocalCandidateId.Construct(localCodeword);
     s.mRemoteCandidateId.Construct(remoteCodeword);
     s.mNominated.Construct(p->nominated);
-    s.mMozPriority.Construct(p->priority);
+    s.mPriority.Construct(p->priority);
     s.mSelected.Construct(p->selected);
     s.mState.Construct(RTCStatsIceCandidatePairState(p->state));
     report->mIceCandidatePairStats.Value().AppendElement(s, fallible);
   }
 
   std::vector<NrIceCandidate> candidates;
   if (NS_SUCCEEDED(mediaStream.GetLocalCandidates(&candidates))) {
     ToRTCIceCandidateStats(candidates,
--- a/toolkit/content/aboutwebrtc/aboutWebrtc.js
+++ b/toolkit/content/aboutwebrtc/aboutWebrtc.js
@@ -630,17 +630,17 @@ ICEStats.prototype = {
     for (let pair of this._report.iceCandidatePairStats) {
       let local = candidates.get(pair.localCandidateId);
       let remote = candidates.get(pair.remoteCandidateId);
 
       if (local) {
         stat = {
           localcandidate: this.candidateToString(local),
           state: pair.state,
-          priority: pair.mozPriority,
+          priority: pair.priority,
           nominated: pair.nominated,
           selected: pair.selected
         };
         matched[local.id] = true;
 
         if (remote) {
           stat.remotecandidate = this.candidateToString(remote);
           matched[remote.id] = true;