--- a/dom/media/webrtc/WebrtcGlobal.h
+++ b/dom/media/webrtc/WebrtcGlobal.h
@@ -98,48 +98,44 @@ struct ParamTraits<mozilla::dom::RTCStat
typedef mozilla::dom::RTCStatsReportInternal paramType;
static void Write(Message* aMsg, const paramType& aParam)
{
WriteParam(aMsg, aParam.mClosed);
WriteParam(aMsg, aParam.mCodecStats);
WriteParam(aMsg, aParam.mIceCandidatePairStats);
WriteParam(aMsg, aParam.mIceCandidateStats);
- WriteParam(aMsg, aParam.mIceComponentStats);
WriteParam(aMsg, aParam.mInboundRTPStreamStats);
WriteParam(aMsg, aParam.mLocalSdp);
WriteParam(aMsg, aParam.mMediaStreamStats);
WriteParam(aMsg, aParam.mMediaStreamTrackStats);
WriteParam(aMsg, aParam.mOutboundRTPStreamStats);
WriteParam(aMsg, aParam.mPcid);
WriteParam(aMsg, aParam.mRemoteSdp);
WriteParam(aMsg, aParam.mTimestamp);
WriteParam(aMsg, aParam.mIceRestarts);
WriteParam(aMsg, aParam.mIceRollbacks);
- WriteParam(aMsg, aParam.mTransportStats);
}
static bool Read(const Message* aMsg, PickleIterator* aIter, paramType* aResult)
{
if (!ReadParam(aMsg, aIter, &(aResult->mClosed)) ||
!ReadParam(aMsg, aIter, &(aResult->mCodecStats)) ||
!ReadParam(aMsg, aIter, &(aResult->mIceCandidatePairStats)) ||
!ReadParam(aMsg, aIter, &(aResult->mIceCandidateStats)) ||
- !ReadParam(aMsg, aIter, &(aResult->mIceComponentStats)) ||
!ReadParam(aMsg, aIter, &(aResult->mInboundRTPStreamStats)) ||
!ReadParam(aMsg, aIter, &(aResult->mLocalSdp)) ||
!ReadParam(aMsg, aIter, &(aResult->mMediaStreamStats)) ||
!ReadParam(aMsg, aIter, &(aResult->mMediaStreamTrackStats)) ||
!ReadParam(aMsg, aIter, &(aResult->mOutboundRTPStreamStats)) ||
!ReadParam(aMsg, aIter, &(aResult->mPcid)) ||
!ReadParam(aMsg, aIter, &(aResult->mRemoteSdp)) ||
!ReadParam(aMsg, aIter, &(aResult->mTimestamp)) ||
!ReadParam(aMsg, aIter, &(aResult->mIceRestarts)) ||
- !ReadParam(aMsg, aIter, &(aResult->mIceRollbacks)) ||
- !ReadParam(aMsg, aIter, &(aResult->mTransportStats))) {
+ !ReadParam(aMsg, aIter, &(aResult->mIceRollbacks))) {
return false;
}
return true;
}
};
typedef mozilla::dom::RTCStats RTCStats;
@@ -259,46 +255,16 @@ struct ParamTraits<mozilla::dom::RTCIceC
!ReadRTCStats(aMsg, aIter, aResult)) {
return false;
}
return true;
}
};
-template<>
-struct ParamTraits<mozilla::dom::RTCIceComponentStats>
-{
- typedef mozilla::dom::RTCIceComponentStats paramType;
-
- static void Write(Message* aMsg, const paramType& aParam)
- {
- WriteParam(aMsg, aParam.mActiveConnection);
- WriteParam(aMsg, aParam.mBytesReceived);
- WriteParam(aMsg, aParam.mBytesSent);
- WriteParam(aMsg, aParam.mComponent);
- WriteParam(aMsg, aParam.mTransportId);
- WriteRTCStats(aMsg, aParam);
- }
-
- static bool Read(const Message* aMsg, PickleIterator* aIter, paramType* aResult)
- {
- if (!ReadParam(aMsg, aIter, &(aResult->mActiveConnection)) ||
- !ReadParam(aMsg, aIter, &(aResult->mBytesReceived)) ||
- !ReadParam(aMsg, aIter, &(aResult->mBytesSent)) ||
- !ReadParam(aMsg, aIter, &(aResult->mComponent)) ||
- !ReadParam(aMsg, aIter, &(aResult->mTransportId)) ||
- !ReadRTCStats(aMsg, aIter, aResult)) {
- return false;
- }
-
- return true;
- }
-};
-
static void WriteRTCRTPStreamStats(
Message* aMsg,
const mozilla::dom::RTCRTPStreamStats& aParam)
{
WriteParam(aMsg, aParam.mBitrateMean);
WriteParam(aMsg, aParam.mBitrateStdDev);
WriteParam(aMsg, aParam.mCodecId);
WriteParam(aMsg, aParam.mFramerateMean);
@@ -420,40 +386,16 @@ struct ParamTraits<mozilla::dom::RTCMedi
return false;
}
return true;
}
};
template<>
-struct ParamTraits<mozilla::dom::RTCTransportStats>
-{
- typedef mozilla::dom::RTCTransportStats paramType;
-
- static void Write(Message* aMsg, const paramType& aParam)
- {
- WriteParam(aMsg, aParam.mBytesReceived);
- WriteParam(aMsg, aParam.mBytesSent);
- WriteRTCStats(aMsg, aParam);
- }
-
- static bool Read(const Message* aMsg, PickleIterator* aIter, paramType* aResult)
- {
- if (!ReadParam(aMsg, aIter, &(aResult->mBytesReceived)) ||
- !ReadParam(aMsg, aIter, &(aResult->mBytesSent)) ||
- !ReadRTCStats(aMsg, aIter, aResult)) {
- return false;
- }
-
- return true;
- }
-};
-
-template<>
struct ParamTraits<mozilla::dom::RTCMediaStreamTrackStats>
{
typedef mozilla::dom::RTCMediaStreamTrackStats paramType;
static void Write(Message* aMsg, const paramType& aParam)
{
WriteParam(aMsg, aParam.mAudioLevel);
WriteParam(aMsg, aParam.mEchoReturnLoss);