Bug 975144 - WebIDL changes for identity error handling refactor, r=j…

…ib,bz
mozilla · Feb 21, 2015 · e92b44d · e92b44d
1 parent 6146b91
commit e92b44d
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 62 deletions.
diff --git a/dom/events/test/test_all_synthetic_events.html b/dom/events/test/test_all_synthetic_events.html
@@ -393,14 +393,6 @@
                                                          return new RTCPeerConnectionIceEvent(aName, aProps);
                                                        },
                                              },
-  RTCPeerConnectionIdentityEvent:            { create: function (aName, aProps) {
-                                                         return new RTCPeerConnectionIdentityEvent(aName, aProps);
-                                                       },
-                                             },
-  RTCPeerConnectionIdentityErrorEvent:       { create: function (aName, aProps) {
-                                                         return new RTCPeerConnectionIdentityErrorEvent(aName, aProps);
-                                                       },
-                                             },
   ScrollAreaEvent:                           { create: function (aName, aProps) {
                                                          var e = document.createEvent("scrollareaevent");
                                                          e.initScrollAreaEvent(aName, aProps.bubbles, aProps.cancelable,

diff --git a/dom/webidl/RTCPeerConnection.webidl b/dom/webidl/RTCPeerConnection.webidl
@@ -83,7 +83,7 @@ interface mozRTCPeerConnection : EventTarget  {
                             optional DOMString protocol,
                             optional DOMString username);
   [Pref="media.peerconnection.identity.enabled"]
-  void getIdentityAssertion();
+  Promise<DOMString> getIdentityAssertion();
   Promise<mozRTCSessionDescription> createOffer (optional RTCOfferOptions options);
   Promise<mozRTCSessionDescription> createAnswer ();
   Promise<void> setLocalDescription (mozRTCSessionDescription description);
@@ -96,7 +96,9 @@ interface mozRTCPeerConnection : EventTarget  {
   readonly attribute RTCIceGatheringState iceGatheringState;
   readonly attribute RTCIceConnectionState iceConnectionState;
   [Pref="media.peerconnection.identity.enabled"]
-  readonly attribute RTCIdentityAssertion? peerIdentity;
+  readonly attribute Promise<RTCIdentityAssertion> peerIdentity;
+  [Pref="media.peerconnection.identity.enabled"]
+  readonly attribute DOMString? idpLoginUrl;
 
   [ChromeOnly]
   attribute DOMString id;
@@ -138,14 +140,6 @@ interface mozRTCPeerConnection : EventTarget  {
   RTCDataChannel createDataChannel (DOMString label,
                                     optional RTCDataChannelInit dataChannelDict);
   attribute EventHandler ondatachannel;
-  [Pref="media.peerconnection.identity.enabled"]
-  attribute EventHandler onidentityresult;
-  [Pref="media.peerconnection.identity.enabled"]
-  attribute EventHandler onpeeridentity;
-  [Pref="media.peerconnection.identity.enabled"]
-  attribute EventHandler onidpassertionerror;
-  [Pref="media.peerconnection.identity.enabled"]
-  attribute EventHandler onidpvalidationerror;
 };
 
 // Legacy callback API

diff --git a/dom/webidl/RTCPeerConnectionIdentityErrorEvent.webidl b/dom/webidl/RTCPeerConnectionIdentityErrorEvent.webidl
diff --git a/dom/webidl/RTCPeerConnectionIdentityEvent.webidl b/dom/webidl/RTCPeerConnectionIdentityEvent.webidl
diff --git a/dom/webidl/moz.build b/dom/webidl/moz.build
@@ -739,8 +739,6 @@ GENERATED_EVENTS_WEBIDL_FILES = [
     'RecordErrorEvent.webidl',
     'RTCDataChannelEvent.webidl',
     'RTCPeerConnectionIceEvent.webidl',
-    'RTCPeerConnectionIdentityErrorEvent.webidl',
-    'RTCPeerConnectionIdentityEvent.webidl',
     'ScrollViewChangeEvent.webidl',
     'SelectionStateChangedEvent.webidl',
     'StyleRuleChangeEvent.webidl',