Changeset 155792 in webkit


Ignore:
Timestamp:
Sep 14, 2013, 5:50:17 PM (12 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:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r155791 r155792  
     12013-09-14  Thiago de Barros Lacerda  <thiago.lacerda@openbossa.org>
     2
     3        MediaStream API: Update RTCDataChannel to match the specification
     4        https://bugs.webkit.org/show_bug.cgi?id=120889
     5
     6        Reviewed by Eric Carlson
     7
     8        Merged from https://chromium.googlesource.com/chromium/blink/+/c3862b0a83e20fc8b1f770c7e4a886a7cceb80d2
     9        by Tommy Widenflycht.
     10
     11        According to WebRTC specification, RTCDataChannel must have the following new attributes:
     12        boolean ordered
     13        unsigned short maxRetransmitTime
     14        unsigned short maxRetransmits
     15        DOMString protocol
     16        boolean negotiated
     17        unsigned short id
     18
     19        and the following one was deprecated:
     20        boolean reliable
     21
     22        Test updates will be landed with https://webkit.org/b/121102.
     23
     24        * Modules/mediastream/RTCDataChannel.cpp:
     25        (WebCore::RTCDataChannel::ordered):
     26        (WebCore::RTCDataChannel::maxRetransmitTime):
     27        (WebCore::RTCDataChannel::maxRetransmits):
     28        (WebCore::RTCDataChannel::protocol):
     29        (WebCore::RTCDataChannel::negotiated):
     30        (WebCore::RTCDataChannel::id):
     31        * Modules/mediastream/RTCDataChannel.h:
     32        * Modules/mediastream/RTCDataChannel.idl:
     33        * platform/mediastream/RTCDataChannelHandler.h:
     34
    1352013-09-14  Sam Weinig  <sam@webkit.org>
    236

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

    r155057 r155792  
    7777}
    7878
    79 bool RTCDataChannel::reliable() const
    80 {
    81     return m_handler->isReliable();
     79bool RTCDataChannel::ordered() const
     80{
     81    return m_handler->ordered();
     82}
     83
     84unsigned short RTCDataChannel::maxRetransmitTime() const
     85{
     86    return m_handler->maxRetransmitTime();
     87}
     88
     89unsigned short RTCDataChannel::maxRetransmits() const
     90{
     91return m_handler->maxRetransmits();
     92}
     93
     94String RTCDataChannel::protocol() const
     95{
     96    return m_handler->protocol();
     97}
     98
     99bool RTCDataChannel::negotiated() const
     100{
     101    return m_handler->negotiated();
     102}
     103
     104unsigned short RTCDataChannel::id() const
     105{
     106    return m_handler->id();
    82107}
    83108

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

    r155478 r155792  
    5252
    5353    String label() const;
    54     bool reliable() const;
     54    bool ordered() const;
     55    unsigned short maxRetransmitTime() const;
     56    unsigned short maxRetransmits() const;
     57    String protocol() const;
     58    bool negotiated() const;
     59    unsigned short id() const;
    5560    String readyState() const;
    5661    unsigned long bufferedAmount() const;

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

    r151336 r155792  
    2929] interface RTCDataChannel {
    3030    readonly attribute DOMString label;
    31     readonly attribute boolean reliable;
     31    readonly attribute boolean ordered;
     32    readonly attribute unsigned short maxRetransmitTime;
     33    readonly attribute unsigned short maxRetransmits;
     34    readonly attribute DOMString protocol;
     35    readonly attribute boolean negotiated;
     36    readonly attribute unsigned short id;
    3237    readonly attribute DOMString readyState;
    3338    readonly attribute unsigned long bufferedAmount;

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

    r137441 r155792  
    4141
    4242    virtual String label() = 0;
    43     virtual bool isReliable() = 0;
     43    virtual bool ordered() = 0;
     44    virtual unsigned short maxRetransmitTime() = 0;
     45    virtual unsigned short maxRetransmits() = 0;
     46    virtual String protocol() = 0;
     47    virtual bool negotiated() = 0;
     48    virtual unsigned short id() = 0;
    4449    virtual unsigned long bufferedAmount() = 0;
    4550
Note: See TracChangeset for help on using the changeset viewer.