Bug 1281150: removed DataChannel.stream. r=jib,smaug
authorNils Ohlmeier [:drno] <drno@ohlmeier.org>
Tue, 21 Jun 2016 15:54:51 +0200
changeset 302366 a048fe8e467d8f5eb1200856235a226f42724505
parent 302365 f5b0be13eebbb0dc0f1fa07516c9698f889336c4
child 302367 e44957e766030775f17cd488941907e7590cfd4a
push id30360
push usercbook@mozilla.com
push dateThu, 23 Jun 2016 12:57:36 +0000
treeherdermozilla-central@d1102663db10 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjib, smaug
bugs1281150
milestone50.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 1281150: removed DataChannel.stream. r=jib,smaug MozReview-Commit-ID: E7FOFlXCzk2
dom/base/nsDOMDataChannel.cpp
dom/base/nsDOMDataChannel.h
dom/base/nsIDOMDataChannel.idl
dom/webidl/DataChannel.webidl
--- a/dom/base/nsDOMDataChannel.cpp
+++ b/dom/base/nsDOMDataChannel.cpp
@@ -138,29 +138,16 @@ nsDOMDataChannel::Id() const
 
 NS_IMETHODIMP
 nsDOMDataChannel::GetId(uint16_t *aId)
 {
   *aId = Id();
   return NS_OK;
 }
 
-uint16_t
-nsDOMDataChannel::Stream() const
-{
-  return mDataChannel->GetStream();
-}
-
-NS_IMETHODIMP
-nsDOMDataChannel::GetStream(uint16_t *aStream)
-{
-  *aStream = Stream();
-  return NS_OK;
-}
-
 // XXX should be GetType()?  Open question for the spec
 bool
 nsDOMDataChannel::Reliable() const
 {
   return mDataChannel->GetType() == mozilla::DataChannelConnection::RELIABLE;
 }
 
 NS_IMETHODIMP
--- a/dom/base/nsDOMDataChannel.h
+++ b/dom/base/nsDOMDataChannel.h
@@ -80,17 +80,16 @@ public:
   void Send(mozilla::dom::Blob& aData, mozilla::ErrorResult& aRv);
   void Send(const mozilla::dom::ArrayBuffer& aData, mozilla::ErrorResult& aRv);
   void Send(const mozilla::dom::ArrayBufferView& aData,
             mozilla::ErrorResult& aRv);
 
   // Uses XPIDL GetProtocol.
   bool Ordered() const;
   uint16_t Id() const;
-  uint16_t Stream() const; // deprecated
 
   nsresult
   DoOnMessageAvailable(const nsACString& aMessage, bool aBinary);
 
   virtual nsresult
   OnMessageAvailable(nsISupports* aContext, const nsACString& aMessage) override;
 
   virtual nsresult
--- a/dom/base/nsIDOMDataChannel.idl
+++ b/dom/base/nsIDOMDataChannel.idl
@@ -20,17 +20,16 @@ interface nsIDOMDataChannel : nsIDOMEven
   readonly attribute DOMString protocol;
   readonly attribute boolean reliable;
   readonly attribute boolean ordered;
 
   readonly attribute DOMString readyState;
   readonly attribute unsigned long bufferedAmount;
 
   readonly attribute unsigned short id;
-  readonly attribute unsigned short stream; /* deprecated name for 'id' */
 
   [implicit_jscontext] attribute jsval onopen;
   [implicit_jscontext] attribute jsval onerror;
   [implicit_jscontext] attribute jsval onclose;
   [implicit_jscontext] attribute jsval onmessage;
 
   attribute DOMString binaryType;
 
--- a/dom/webidl/DataChannel.webidl
+++ b/dom/webidl/DataChannel.webidl
@@ -40,11 +40,9 @@ interface DataChannel : EventTarget
 };
 
 // Mozilla extensions.
 partial interface DataChannel
 {
   readonly attribute DOMString protocol;
   readonly attribute boolean ordered;
   readonly attribute unsigned short id;
-  // this is deprecated due to renaming in the spec, but still supported for Fx22
-  readonly attribute unsigned short stream; // now id
 };