Changeset 155792 in webkit

Timestamp:

Sep 14, 2013 5:50:17 PM (11 years ago)

Author:

eric.carlson@apple.com

Message:

MediaStream API: Update RTCDataChannel to match the specification
​https://bugs.webkit.org/show_bug.cgi?id=120889

Patch by Thiago de Barros Lacerda <​thiago.lacerda@openbossa.org> 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:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/mediastream/RTCDataChannel.cpp (modified) (1 diff)
• Modules/mediastream/RTCDataChannel.h (modified) (1 diff)
• Modules/mediastream/RTCDataChannel.idl (modified) (1 diff)
• platform/mediastream/RTCDataChannelHandler.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-09-14  Thiago de Barros Lacerda  <thiago.lacerda@openbossa.org>
+
+        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  <sam@webkit.org>
 

trunk/Source/WebCore/Modules/mediastream/RTCDataChannel.cpp

@@ -77 +77 @@
 }
 
-bool RTCDataChannel::reliable() const
-{
-    return m_handler->isReliable();
+bool RTCDataChannel::ordered() const
+{
+    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();
 }
 

trunk/Source/WebCore/Modules/mediastream/RTCDataChannel.h

@@ -52 +52 @@
 
     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;

trunk/Source/WebCore/Modules/mediastream/RTCDataChannel.idl

@@ -29 +29 @@
 ] 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;

trunk/Source/WebCore/platform/mediastream/RTCDataChannelHandler.h

@@ -41 +41 @@
 
     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;