Bug 1745912 - Use the same type in IDL and implementation file for Me…

…diaTransportHandler. r=pehrsons Depends on D133733 Differential Revision: https://phabricator.services.mozilla.com/D133737
dothq · Dec 14, 2021 · f80d2b4 · f80d2b4
1 parent 282dc29
commit f80d2b4
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/dom/media/webrtc/jsapi/MediaTransportHandler.cpp b/dom/media/webrtc/jsapi/MediaTransportHandler.cpp
@@ -88,7 +88,7 @@ class MediaTransportHandlerSTS : public MediaTransportHandler,
   void EnsureProvisionalTransport(const std::string& aTransportId,
                                   const std::string& aUfrag,
                                   const std::string& aPwd,
-                                  size_t aComponentCount) override;
+                                  int aComponentCount) override;
 
   void SetTargetForDefaultLocalAddressLookup(const std::string& aTargetIp,
                                              uint16_t aTargetPort) override;
@@ -734,7 +734,7 @@ void MediaTransportHandlerSTS::SetProxyConfig(
 
 void MediaTransportHandlerSTS::EnsureProvisionalTransport(
     const std::string& aTransportId, const std::string& aUfrag,
-    const std::string& aPwd, size_t aComponentCount) {
+    const std::string& aPwd, int aComponentCount) {
   MOZ_RELEASE_ASSERT(mInitPromise);
 
   mInitPromise->Then(
@@ -746,9 +746,9 @@ void MediaTransportHandlerSTS::EnsureProvisionalTransport(
 
         RefPtr<NrIceMediaStream> stream(mIceCtx->GetStream(aTransportId));
         if (!stream) {
-          CSFLogDebug(LOGTAG, "%s: Creating ICE media stream=%s components=%u",
+          CSFLogDebug(LOGTAG, "%s: Creating ICE media stream=%s components=%d",
                       mIceCtx->name().c_str(), aTransportId.c_str(),
-                      static_cast<unsigned>(aComponentCount));
+                      aComponentCount);
 
           std::ostringstream os;
           os << mIceCtx->name() << " transport-id=" << aTransportId;

diff --git a/dom/media/webrtc/jsapi/MediaTransportHandler.h b/dom/media/webrtc/jsapi/MediaTransportHandler.h
@@ -74,7 +74,7 @@ class MediaTransportHandler {
   virtual void EnsureProvisionalTransport(const std::string& aTransportId,
                                           const std::string& aLocalUfrag,
                                           const std::string& aLocalPwd,
-                                          size_t aComponentCount) = 0;
+                                          int aComponentCount) = 0;
 
   virtual void SetTargetForDefaultLocalAddressLookup(
       const std::string& aTargetIp, uint16_t aTargetPort) = 0;

diff --git a/dom/media/webrtc/jsapi/MediaTransportHandlerIPC.cpp b/dom/media/webrtc/jsapi/MediaTransportHandlerIPC.cpp
@@ -179,7 +179,7 @@ void MediaTransportHandlerIPC::SetProxyConfig(
 
 void MediaTransportHandlerIPC::EnsureProvisionalTransport(
     const std::string& aTransportId, const std::string& aLocalUfrag,
-    const std::string& aLocalPwd, size_t aComponentCount) {
+    const std::string& aLocalPwd, int aComponentCount) {
   mInitPromise->Then(
       mCallbackThread, __func__,
       [=, self = RefPtr<MediaTransportHandlerIPC>(this)](bool /*dummy*/) {

diff --git a/dom/media/webrtc/jsapi/MediaTransportHandlerIPC.h b/dom/media/webrtc/jsapi/MediaTransportHandlerIPC.h
@@ -33,7 +33,7 @@ class MediaTransportHandlerIPC : public MediaTransportHandler {
   void EnsureProvisionalTransport(const std::string& aTransportId,
                                   const std::string& aLocalUfrag,
                                   const std::string& aLocalPwd,
-                                  size_t aComponentCount) override;
+                                  int aComponentCount) override;
 
   void SetTargetForDefaultLocalAddressLookup(const std::string& aTargetIp,
                                              uint16_t aTargetPort) override;

diff --git a/media/webrtc/signaling/gtest/mediapipeline_unittest.cpp b/media/webrtc/signaling/gtest/mediapipeline_unittest.cpp
@@ -204,7 +204,7 @@ class LoopbackTransport : public MediaTransportHandler {
   void EnsureProvisionalTransport(const std::string& aTransportId,
                                   const std::string& aLocalUfrag,
                                   const std::string& aLocalPwd,
-                                  size_t aComponentCount) override {}
+                                  int aComponentCount) override {}
 
   void SetTargetForDefaultLocalAddressLookup(const std::string& aTargetIp,
                                              uint16_t aTargetPort) override {}