MediaStream API: Update RTCDataChannel to match the specification

https://bugs.webkit.org/show_bug.cgi?id=120889 Patch by Thiago de Barros Lacerda <[email protected]> on 2013-09-14 Reviewed by Eric Carlson Merged from https://chromium.googlesource.com/chromium/blink/+/c3862b0a83e20fc8b1f770c7e4a886a7cceb80d2 by Tommy Widenflycht. According to WebRTC specification, RTCDataChannel must have the following new attributes: boolean ordered unsigned short maxRetransmitTime unsigned short maxRetransmits DOMString protocol boolean negotiated unsigned short id and the following one was deprecated: boolean reliable Test updates will be landed with https://webkit.org/b/121102. * Modules/mediastream/RTCDataChannel.cpp: (WebCore::RTCDataChannel::ordered): (WebCore::RTCDataChannel::maxRetransmitTime): (WebCore::RTCDataChannel::maxRetransmits): (WebCore::RTCDataChannel::protocol): (WebCore::RTCDataChannel::negotiated): (WebCore::RTCDataChannel::id): * Modules/mediastream/RTCDataChannel.h: * Modules/mediastream/RTCDataChannel.idl: * platform/mediastream/RTCDataChannelHandler.h: git-svn-id: http://svn.webkit.org/repository/webkit/trunk@155792 268f45cc-cd09-0410-ab3c-d52691b4dbfc
WebKitNix · Sep 15, 2013 · d944159 · d944159
1 parent 4917883
commit d944159
Show file tree

Hide file tree

Showing 5 changed files with 79 additions and 5 deletions.
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
@@ -1,3 +1,37 @@
+2013-09-14  Thiago de Barros Lacerda  <[email protected]>
+
+        MediaStream API: Update RTCDataChannel to match the specification
+        https://bugs.webkit.org/show_bug.cgi?id=120889
+
+        Reviewed by Eric Carlson
+
+        Merged from https://chromium.googlesource.com/chromium/blink/+/c3862b0a83e20fc8b1f770c7e4a886a7cceb80d2
+        by Tommy Widenflycht.
+
+        According to WebRTC specification, RTCDataChannel must have the following new attributes:
+        boolean ordered
+        unsigned short maxRetransmitTime
+        unsigned short maxRetransmits
+        DOMString protocol
+        boolean negotiated
+        unsigned short id
+
+        and the following one was deprecated:
+        boolean reliable
+
+        Test updates will be landed with https://webkit.org/b/121102.
+
+        * Modules/mediastream/RTCDataChannel.cpp:
+        (WebCore::RTCDataChannel::ordered):
+        (WebCore::RTCDataChannel::maxRetransmitTime):
+        (WebCore::RTCDataChannel::maxRetransmits):
+        (WebCore::RTCDataChannel::protocol):
+        (WebCore::RTCDataChannel::negotiated):
+        (WebCore::RTCDataChannel::id):
+        * Modules/mediastream/RTCDataChannel.h:
+        * Modules/mediastream/RTCDataChannel.idl:
+        * platform/mediastream/RTCDataChannelHandler.h:
+
 2013-09-14  Sam Weinig  <[email protected]>
 
         [CTTE] Node subclasses should take a Document by reference in their constructor (Part 4)

diff --git a/Source/WebCore/Modules/mediastream/RTCDataChannel.cpp b/Source/WebCore/Modules/mediastream/RTCDataChannel.cpp
@@ -76,9 +76,34 @@ String RTCDataChannel::label() const
     return m_handler->label();
 }
 
-bool RTCDataChannel::reliable() const
+bool RTCDataChannel::ordered() const
 {
-    return m_handler->isReliable();
+    return m_handler->ordered();
+}
+
+unsigned short RTCDataChannel::maxRetransmitTime() const
+{
+    return m_handler->maxRetransmitTime();
+}
+
+unsigned short RTCDataChannel::maxRetransmits() const
+{
+return m_handler->maxRetransmits();
+}
+
+String RTCDataChannel::protocol() const
+{
+    return m_handler->protocol();
+}
+
+bool RTCDataChannel::negotiated() const
+{
+    return m_handler->negotiated();
+}
+
+unsigned short RTCDataChannel::id() const
+{
+    return m_handler->id();
 }
 
 String RTCDataChannel::readyState() const

diff --git a/Source/WebCore/Modules/mediastream/RTCDataChannel.h b/Source/WebCore/Modules/mediastream/RTCDataChannel.h
@@ -51,7 +51,12 @@ class RTCDataChannel : public RefCounted<RTCDataChannel>, public ScriptWrappable
     ~RTCDataChannel();
 
     String label() const;
-    bool reliable() const;
+    bool ordered() const;
+    unsigned short maxRetransmitTime() const;
+    unsigned short maxRetransmits() const;
+    String protocol() const;
+    bool negotiated() const;
+    unsigned short id() const;
     String readyState() const;
     unsigned long bufferedAmount() const;
 

diff --git a/Source/WebCore/Modules/mediastream/RTCDataChannel.idl b/Source/WebCore/Modules/mediastream/RTCDataChannel.idl
@@ -28,7 +28,12 @@
     EventTarget
 ] interface RTCDataChannel {
     readonly attribute DOMString label;
-    readonly attribute boolean reliable;
+    readonly attribute boolean ordered;
+    readonly attribute unsigned short maxRetransmitTime;
+    readonly attribute unsigned short maxRetransmits;
+    readonly attribute DOMString protocol;
+    readonly attribute boolean negotiated;
+    readonly attribute unsigned short id;
     readonly attribute DOMString readyState;
     readonly attribute unsigned long bufferedAmount;
 

diff --git a/Source/WebCore/platform/mediastream/RTCDataChannelHandler.h b/Source/WebCore/platform/mediastream/RTCDataChannelHandler.h
@@ -40,7 +40,12 @@ class RTCDataChannelHandler {
     virtual void setClient(RTCDataChannelHandlerClient*) = 0;
 
     virtual String label() = 0;
-    virtual bool isReliable() = 0;
+    virtual bool ordered() = 0;
+    virtual unsigned short maxRetransmitTime() = 0;
+    virtual unsigned short maxRetransmits() = 0;
+    virtual String protocol() = 0;
+    virtual bool negotiated() = 0;
+    virtual unsigned short id() = 0;
     virtual unsigned long bufferedAmount() = 0;
 
     virtual bool sendStringData(const String&) = 0;