Bug 1550177 - Part 1: Remove some duplicate webidl enums. r=mjf,smaug

Differential Revision: https://phabricator.services.mozilla.com/D30991

dom/media/PeerConnection.jsm

@@ -1580,15 +1580,7 @@ class RTCPeerConnection {
     if (this._closed) {
       return "closed";
     }
-    return {
-      "SignalingInvalid":            "",
-      "SignalingStable":             "stable",
-      "SignalingHaveLocalOffer":     "have-local-offer",
-      "SignalingHaveRemoteOffer":    "have-remote-offer",
-      "SignalingHaveLocalPranswer":  "have-local-pranswer",
-      "SignalingHaveRemotePranswer": "have-remote-pranswer",
-      "SignalingClosed":             "closed",
-    }[this._impl.signalingState];
+    return this._impl.signalingState;
   }
 
   changeIceGatheringState(state) {

dom/webidl/PeerConnectionImpl.webidl

@@ -116,9 +116,9 @@ interface PeerConnectionImpl  {
   readonly attribute DOMString currentRemoteDescription;
   readonly attribute DOMString pendingRemoteDescription;
 
-  readonly attribute PCImplIceConnectionState iceConnectionState;
-  readonly attribute PCImplIceGatheringState iceGatheringState;
-  readonly attribute PCImplSignalingState signalingState;
+  readonly attribute RTCIceConnectionState iceConnectionState;
+  readonly attribute RTCIceGatheringState iceGatheringState;
+  readonly attribute RTCSignalingState signalingState;
   attribute DOMString id;
 
   [SetterThrows]

dom/webidl/moz.build

@@ -965,7 +965,6 @@ WEBIDL_FILES = [
 if CONFIG['MOZ_WEBRTC']:
     WEBIDL_FILES += [
         'PeerConnectionImpl.webidl',
-        'PeerConnectionImplEnums.webidl',
         'PeerConnectionObserver.webidl',
         'PeerConnectionObserverEnums.webidl',
         'RTCCertificate.webidl',

media/webrtc/signaling/src/peerconnection/MediaTransportHandler.cpp

@@ -640,7 +640,7 @@ void MediaTransportHandlerSTS::StartIceGathering(
   // If there are no streams, we're probably in a situation where we've rolled
   // back while still waiting for our proxy configuration to come back. Make
   // sure content knows that the rollback has stuck wrt gathering.
-  OnGatheringStateChange(dom::PCImplIceGatheringState::Complete);
+  OnGatheringStateChange(dom::RTCIceGatheringState::Complete);
 }
 
 void MediaTransportHandlerSTS::StartIceChecks(
@@ -885,7 +885,7 @@ void MediaTransportHandler::OnAlpnNegotiated(const std::string& aAlpn) {
 }
 
 void MediaTransportHandler::OnGatheringStateChange(
-    dom::PCImplIceGatheringState aState) {
+    dom::RTCIceGatheringState aState) {
   if (mCallbackThread && !mCallbackThread->IsOnCurrentThread()) {
     mCallbackThread->Dispatch(
         WrapRunnable(RefPtr<MediaTransportHandler>(this),
@@ -898,7 +898,7 @@ void MediaTransportHandler::OnGatheringStateChange(
 }
 
 void MediaTransportHandler::OnConnectionStateChange(
-    dom::PCImplIceConnectionState aState) {
+    dom::RTCIceConnectionState aState) {
   if (mCallbackThread && !mCallbackThread->IsOnCurrentThread()) {
     mCallbackThread->Dispatch(
         WrapRunnable(RefPtr<MediaTransportHandler>(this),
@@ -1261,15 +1261,15 @@ RefPtr<TransportFlow> MediaTransportHandlerSTS::CreateTransportFlow(
   return flow;
 }
 
-static mozilla::dom::PCImplIceGatheringState toDomIceGatheringState(
+static mozilla::dom::RTCIceGatheringState toDomIceGatheringState(
     NrIceCtx::GatheringState aState) {
   switch (aState) {
     case NrIceCtx::ICE_CTX_GATHER_INIT:
-      return dom::PCImplIceGatheringState::New;
+      return dom::RTCIceGatheringState::New;
     case NrIceCtx::ICE_CTX_GATHER_STARTED:
-      return dom::PCImplIceGatheringState::Gathering;
+      return dom::RTCIceGatheringState::Gathering;
     case NrIceCtx::ICE_CTX_GATHER_COMPLETE:
-      return dom::PCImplIceGatheringState::Complete;
+      return dom::RTCIceGatheringState::Complete;
   }
   MOZ_CRASH();
 }
@@ -1279,23 +1279,23 @@ void MediaTransportHandlerSTS::OnGatheringStateChange(
   OnGatheringStateChange(toDomIceGatheringState(aState));
 }
 
-static mozilla::dom::PCImplIceConnectionState toDomIceConnectionState(
+static mozilla::dom::RTCIceConnectionState toDomIceConnectionState(
     NrIceCtx::ConnectionState aState) {
   switch (aState) {
     case NrIceCtx::ICE_CTX_INIT:
-      return dom::PCImplIceConnectionState::New;
+      return dom::RTCIceConnectionState::New;
     case NrIceCtx::ICE_CTX_CHECKING:
-      return dom::PCImplIceConnectionState::Checking;
+      return dom::RTCIceConnectionState::Checking;
     case NrIceCtx::ICE_CTX_CONNECTED:
-      return dom::PCImplIceConnectionState::Connected;
+      return dom::RTCIceConnectionState::Connected;
     case NrIceCtx::ICE_CTX_COMPLETED:
-      return dom::PCImplIceConnectionState::Completed;
+      return dom::RTCIceConnectionState::Completed;
     case NrIceCtx::ICE_CTX_FAILED:
-      return dom::PCImplIceConnectionState::Failed;
+      return dom::RTCIceConnectionState::Failed;
     case NrIceCtx::ICE_CTX_DISCONNECTED:
-      return dom::PCImplIceConnectionState::Disconnected;
+      return dom::RTCIceConnectionState::Disconnected;
     case NrIceCtx::ICE_CTX_CLOSED:
-      return dom::PCImplIceConnectionState::Closed;
+      return dom::RTCIceConnectionState::Closed;
   }
   MOZ_CRASH();
 }

media/webrtc/signaling/src/peerconnection/MediaTransportHandler.h

@@ -10,7 +10,7 @@
 #include "sigslot.h"
 #include "transportlayer.h"  // Need the State enum
 #include "dtlsidentity.h"    // For DtlsDigest
-#include "mozilla/dom/PeerConnectionImplEnumsBinding.h"
+#include "mozilla/dom/RTCPeerConnectionBinding.h"
 #include "mozilla/dom/RTCConfigurationBinding.h"
 #include "nricectx.h"               // Need some enums
 #include "nsDOMNavigationTiming.h"  // DOMHighResTimeStamp
@@ -120,8 +120,8 @@ class MediaTransportHandler {
 
   sigslot::signal2<const std::string&, const CandidateInfo&> SignalCandidate;
   sigslot::signal1<const std::string&> SignalAlpnNegotiated;
-  sigslot::signal1<dom::PCImplIceGatheringState> SignalGatheringStateChange;
-  sigslot::signal1<dom::PCImplIceConnectionState> SignalConnectionStateChange;
+  sigslot::signal1<dom::RTCIceGatheringState> SignalGatheringStateChange;
+  sigslot::signal1<dom::RTCIceConnectionState> SignalConnectionStateChange;
 
   sigslot::signal2<const std::string&, MediaPacket&> SignalPacketReceived;
   sigslot::signal2<const std::string&, MediaPacket&> SignalEncryptedSending;
@@ -137,8 +137,8 @@ class MediaTransportHandler {
   void OnCandidate(const std::string& aTransportId,
                    const CandidateInfo& aCandidateInfo);
   void OnAlpnNegotiated(const std::string& aAlpn);
-  void OnGatheringStateChange(dom::PCImplIceGatheringState aState);
-  void OnConnectionStateChange(dom::PCImplIceConnectionState aState);
+  void OnGatheringStateChange(dom::RTCIceGatheringState aState);
+  void OnConnectionStateChange(dom::RTCIceConnectionState aState);
   void OnPacketReceived(const std::string& aTransportId, MediaPacket& aPacket);
   void OnEncryptedSending(const std::string& aTransportId,
                           MediaPacket& aPacket);

media/webrtc/signaling/src/peerconnection/MediaTransportHandlerIPC.cpp

@@ -333,16 +333,15 @@ mozilla::ipc::IPCResult MediaTransportChild::RecvOnAlpnNegotiated(
 mozilla::ipc::IPCResult MediaTransportChild::RecvOnGatheringStateChange(
     const int& state) {
   MOZ_ASSERT(GetMainThreadEventTarget()->IsOnCurrentThread());
-  mUser->OnGatheringStateChange(
-      static_cast<dom::PCImplIceGatheringState>(state));
+  mUser->OnGatheringStateChange(static_cast<dom::RTCIceGatheringState>(state));
   return ipc::IPCResult::Ok();
 }
 
 mozilla::ipc::IPCResult MediaTransportChild::RecvOnConnectionStateChange(
     const int& state) {
   MOZ_ASSERT(GetMainThreadEventTarget()->IsOnCurrentThread());
   mUser->OnConnectionStateChange(
-      static_cast<dom::PCImplIceConnectionState>(state));
+      static_cast<dom::RTCIceConnectionState>(state));
   return ipc::IPCResult::Ok();
 }
 

media/webrtc/signaling/src/peerconnection/MediaTransportParent.cpp

@@ -52,12 +52,12 @@ class MediaTransportParent::Impl : public sigslot::has_slots<> {
     NS_ENSURE_TRUE_VOID(mParent->SendOnAlpnNegotiated(aAlpn));
   }
 
-  void OnGatheringStateChange(dom::PCImplIceGatheringState aState) {
+  void OnGatheringStateChange(dom::RTCIceGatheringState aState) {
     NS_ENSURE_TRUE_VOID(
         mParent->SendOnGatheringStateChange(static_cast<int>(aState)));
   }
 
-  void OnConnectionStateChange(dom::PCImplIceConnectionState aState) {
+  void OnConnectionStateChange(dom::RTCIceConnectionState aState) {
     NS_ENSURE_TRUE_VOID(
         mParent->SendOnConnectionStateChange(static_cast<int>(aState)));
   }