Changeset 146582 in webkit


Ignore:
Timestamp:
Mar 22, 2013 2:29:37 AM (11 years ago)
Author:
tommyw@google.com
Message:

MediaStream API: Finalize the RTCPeerConnection states
​https://bugs.webkit.org/show_bug.cgi?id=112792

Reviewed by Adam Barth.

Source/Platform:

  • chromium/public/WebRTCPeerConnectionHandlerClient.h:

Source/WebCore:

This patch finalized the RTCPeerConnection state and events. These changes
have not yet pushed out to the editors draft; but they are uncontroversial
and agreed upon.

readyState will be deleted; please use the replacement signalingState which is already available.
onstatechange -> onsignalingstatechange
onicechange -> oniceconnectionstatechange
ongatheringchange will be deleted since oniceconnectionstatechange can be used for the same purpose.
RTCIceConnectionState::"starting" -> RTCIceConnectionState::"new"

Patch covered by modified tests.

  • Modules/mediastream/RTCPeerConnection.cpp:

(WebCore::RTCPeerConnection::RTCPeerConnection):
(WebCore::RTCPeerConnection::iceConnectionState):
(WebCore::RTCPeerConnection::changeSignalingState):
(WebCore::RTCPeerConnection::changeIceGatheringState):
(WebCore::RTCPeerConnection::changeIceConnectionState):

  • Modules/mediastream/RTCPeerConnection.h:

(RTCPeerConnection):

  • Modules/mediastream/RTCPeerConnection.idl:
  • dom/EventNames.h:

(WebCore):

  • platform/mediastream/RTCPeerConnectionHandlerClient.h:

Source/WebKit/chromium:

  • src/AssertMatchingEnums.cpp:

LayoutTests:

  • fast/mediastream/RTCPeerConnection-datachannel.html:
  • fast/mediastream/RTCPeerConnection-dtmf.html:
  • fast/mediastream/RTCPeerConnection-events-expected.txt:
  • fast/mediastream/RTCPeerConnection-events.html:
  • fast/mediastream/RTCPeerConnection-ice.html:
  • fast/mediastream/RTCPeerConnection-state-expected.txt:
  • fast/mediastream/RTCPeerConnection-state.html:
Location:
trunk
Files:
18 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r146579 r146582  
     12013-03-22  Tommy Widenflycht  <tommyw@google.com>
     2
     3        MediaStream API: Finalize the RTCPeerConnection states
     4        https://bugs.webkit.org/show_bug.cgi?id=112792
     5
     6        Reviewed by Adam Barth.
     7
     8        * fast/mediastream/RTCPeerConnection-datachannel.html:
     9        * fast/mediastream/RTCPeerConnection-dtmf.html:
     10        * fast/mediastream/RTCPeerConnection-events-expected.txt:
     11        * fast/mediastream/RTCPeerConnection-events.html:
     12        * fast/mediastream/RTCPeerConnection-ice.html:
     13        * fast/mediastream/RTCPeerConnection-state-expected.txt:
     14        * fast/mediastream/RTCPeerConnection-state.html:
     15
    1162013-03-22  Ádám Kallai  <kadam@inf.u-szeged.hu>
    217

  • trunk/LayoutTests/fast/mediastream/RTCPeerConnection-datachannel.html

    r140310 r146582  
    9393
    9494pc = new webkitRTCPeerConnection(null, null);
    95 pc.onicechange = pc_onicechange;
     95pc.oniceconnectionstatechange = pc_onicechange;
    9696pc.ondatachannel = pc_ondatachannel;
    9797

  • trunk/LayoutTests/fast/mediastream/RTCPeerConnection-dtmf.html

    r141984 r146582  
    5454
    5555    pc = new webkitRTCPeerConnection(null, null);
    56     pc.onicechange = pc_onicechange;
     56    pc.oniceconnectionstatechange = pc_onicechange;
    5757}
    5858

  • trunk/LayoutTests/fast/mediastream/RTCPeerConnection-events-expected.txt

    r132420 r146582  
    99PASS onNegotiationNeeded done.
    1010PASS onStateChange was called.
    11 PASS pc.readyState is 'closed'
     11PASS pc.signalingState is 'closed'
    1212PASS successfullyParsed is true
    1313

  • trunk/LayoutTests/fast/mediastream/RTCPeerConnection-events.html

    r132420 r146582  
    2727function onStateChange(event) {
    2828    testPassed('onStateChange was called.');
    29     shouldBe("pc.readyState", "'closed'");
     29    shouldBe("pc.signalingState", "'closed'");
    3030    finishJSTest();
    3131}
    … …  
    3333function onNegotiationNeeded(event) {
    3434    testPassed('onNegotiationNeeded was called.');
    35     pc.onstatechange = onStateChange;
     35    pc.onsignalingstatechange = onStateChange;
    3636    pc.close();
    3737    testPassed('onNegotiationNeeded done.')

  • trunk/LayoutTests/fast/mediastream/RTCPeerConnection-ice.html

    r140310 r146582  
    2323    shouldBe('event.candidate.candidate', '"nano nano"');
    2424
    25     pc.onicechange = onIceChange2;
     25    pc.oniceconnectionstatechange = onIceChange2;
    2626    pc.close();
    2727}
    … …  
    3737
    3838shouldNotThrow('pc = new webkitRTCPeerConnection(null, null);');
    39 pc.onicechange = onIceChange1;
     39pc.oniceconnectionstatechange = onIceChange1;
    4040
    4141window.jsTestIsAsync = true;

  • trunk/LayoutTests/fast/mediastream/RTCPeerConnection-state-expected.txt

    r140310 r146582  
    55
    66PASS pc = new webkitRTCPeerConnection({iceServers:[]}, null); did not throw exception.
    7 PASS pc.readyState is "stable"
     7PASS pc.signalingState is "stable"
    88PASS stateChanged was called
    9 PASS pc.readyState is "closed"
     9PASS pc.signalingState is "closed"
    1010PASS successfullyParsed is true
    1111

  • trunk/LayoutTests/fast/mediastream/RTCPeerConnection-state.html

    r140310 r146582  
    1313{
    1414    testPassed("stateChanged was called");
    15     shouldBe('pc.readyState','"closed"');
     15    shouldBeEqualToString('pc.signalingState', 'closed');
    1616    finishJSTest();
    1717}
    1818
    1919shouldNotThrow('pc = new webkitRTCPeerConnection({iceServers:[]}, null);');
    20 shouldBe('pc.readyState', '"stable"');
    21 pc.onstatechange = stateChanged;
     20shouldBeEqualToString('pc.signalingState', 'stable');
     21pc.onsignalingstatechange = stateChanged;
    2222pc.close();
    2323

  • trunk/Source/Platform/ChangeLog

    r146561 r146582  
     12013-03-22  Tommy Widenflycht  <tommyw@google.com>
     2
     3        MediaStream API: Finalize the RTCPeerConnection states
     4        https://bugs.webkit.org/show_bug.cgi?id=112792
     5
     6        Reviewed by Adam Barth.
     7
     8        * chromium/public/WebRTCPeerConnectionHandlerClient.h:
     9
    1102013-03-21  David Grogan  <dgrogan@chromium.org>
    211

  • trunk/Source/Platform/chromium/public/WebRTCPeerConnectionHandlerClient.h

    r145740 r146582  
    4949
    5050    enum ICEConnectionState {
    51         ICEConnectionStateStarting = 1,
     51        ICEConnectionStateNew = 1,
    5252        ICEConnectionStateChecking = 2,
    5353        ICEConnectionStateConnected = 3,
    … …  
    5656        ICEConnectionStateDisconnected = 6,
    5757        ICEConnectionStateClosed = 7,
     58
     59        // DEPRECATED
     60        ICEConnectionStateStarting = 1,
    5861    };
    5962

  • trunk/Source/WebCore/ChangeLog

    r146580 r146582  
     12013-03-22  Tommy Widenflycht  <tommyw@google.com>
     2
     3        MediaStream API: Finalize the RTCPeerConnection states
     4        https://bugs.webkit.org/show_bug.cgi?id=112792
     5
     6        Reviewed by Adam Barth.
     7
     8        This patch finalized the RTCPeerConnection state and events. These changes
     9        have not yet pushed out to the editors draft; but they are uncontroversial
     10        and agreed upon.
     11
     12        readyState will be deleted; please use the replacement signalingState which is already available.
     13        onstatechange -> onsignalingstatechange
     14        onicechange -> oniceconnectionstatechange
     15        ongatheringchange will be deleted since oniceconnectionstatechange can be used for the same purpose.
     16        RTCIceConnectionState::"starting" -> RTCIceConnectionState::"new"
     17
     18        Patch covered by modified tests.
     19
     20        * Modules/mediastream/RTCPeerConnection.cpp:
     21        (WebCore::RTCPeerConnection::RTCPeerConnection):
     22        (WebCore::RTCPeerConnection::iceConnectionState):
     23        (WebCore::RTCPeerConnection::changeSignalingState):
     24        (WebCore::RTCPeerConnection::changeIceGatheringState):
     25        (WebCore::RTCPeerConnection::changeIceConnectionState):
     26        * Modules/mediastream/RTCPeerConnection.h:
     27        (RTCPeerConnection):
     28        * Modules/mediastream/RTCPeerConnection.idl:
     29        * dom/EventNames.h:
     30        (WebCore):
     31        * platform/mediastream/RTCPeerConnectionHandlerClient.h:
     32
    1332013-03-22  Mike West  <mkwst@chromium.org>
    234

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

    r146537 r146582  
    136136    , m_signalingState(SignalingStateStable)
    137137    , m_iceGatheringState(IceGatheringStateNew)
    138     , m_iceConnectionState(IceConnectionStateStarting)
     138    , m_iceConnectionState(IceConnectionStateNew)
    139139    , m_scheduledEventTimer(this, &RTCPeerConnection::scheduledEventTimerFired)
    140140    , m_stopped(false)
    … …  
    295295    if (!valid)
    296296        ec = SYNTAX_ERR;
    297 }
    298 
    299 String RTCPeerConnection::readyState() const
    300 {
    301     return signalingState();
    302297}
    303298
    … …  
    341336{
    342337    switch (m_iceConnectionState) {
    343     case IceConnectionStateStarting:
    344         return ASCIILiteral("starting");
     338    case IceConnectionStateNew:
     339        return ASCIILiteral("new");
    345340    case IceConnectionStateChecking:
    346341        return ASCIILiteral("checking");
    … …  
    623618    if (m_signalingState != SignalingStateClosed && m_signalingState != signalingState) {
    624619        m_signalingState = signalingState;
    625         scheduleDispatchEvent(Event::create(eventNames().statechangeEvent, false, false));
     620        scheduleDispatchEvent(Event::create(eventNames().signalingstatechangeEvent, false, false));
    626621    }
    627622}
    … …  
    629624void RTCPeerConnection::changeIceGatheringState(IceGatheringState iceGatheringState)
    630625{
    631     if (m_iceGatheringState != iceGatheringState) {
    632         m_iceGatheringState = iceGatheringState;
    633         scheduleDispatchEvent(Event::create(eventNames().gatheringchangeEvent, false, false));
    634     }
     626    m_iceGatheringState = iceGatheringState;
    635627}
    636628
    … …  
    639631    if (m_iceConnectionState != IceConnectionStateClosed && m_iceConnectionState != iceConnectionState) {
    640632        m_iceConnectionState = iceConnectionState;
    641         scheduleDispatchEvent(Event::create(eventNames().icechangeEvent, false, false));
     633        scheduleDispatchEvent(Event::create(eventNames().iceconnectionstatechangeEvent, false, false));
    642634    }
    643635}

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

    r144748 r146582  
    7373    PassRefPtr<RTCSessionDescription> remoteDescription(ExceptionCode&);
    7474
    75     // DEPRECATED
    76     String readyState() const;
    77 
    7875    String signalingState() const;
    7976
    … …  
    106103    DEFINE_ATTRIBUTE_EVENT_LISTENER(negotiationneeded);
    107104    DEFINE_ATTRIBUTE_EVENT_LISTENER(icecandidate);
    108     DEFINE_ATTRIBUTE_EVENT_LISTENER(statechange);
     105    DEFINE_ATTRIBUTE_EVENT_LISTENER(signalingstatechange);
    109106    DEFINE_ATTRIBUTE_EVENT_LISTENER(addstream);
    110107    DEFINE_ATTRIBUTE_EVENT_LISTENER(removestream);
    111     DEFINE_ATTRIBUTE_EVENT_LISTENER(gatheringchange);
    112     DEFINE_ATTRIBUTE_EVENT_LISTENER(icechange);
     108    DEFINE_ATTRIBUTE_EVENT_LISTENER(iceconnectionstatechange);
    113109    DEFINE_ATTRIBUTE_EVENT_LISTENER(datachannel);
    114110

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

    r144748 r146582  
    5353        getter raises(DOMException);
    5454
    55     // DEPRECATED
    56     readonly attribute DOMString readyState;
    57 
    5855    readonly attribute DOMString signalingState;
    5956
    … …  
    8986    attribute EventListener onnegotiationneeded;
    9087    attribute EventListener onicecandidate;
    91     attribute EventListener onstatechange;
     88    attribute EventListener onsignalingstatechange;
    9289    attribute EventListener onaddstream;
    9390    attribute EventListener onremovestream;
    94     attribute EventListener ongatheringchange;
    95     attribute EventListener onicechange;
     91    attribute EventListener oniceconnectionstatechange;
    9692    attribute EventListener ondatachannel;
    9793

  • trunk/Source/WebCore/dom/EventNames.h

    r146305 r146582  
    228228    macro(addstream) \
    229229    macro(removestream) \
    230     macro(statechange) \
     230    macro(signalingstatechange) \
    231231    macro(removetrack) \
    232232    macro(mute) \
    233233    macro(unmute) \
    234     macro(icechange) \
     234    macro(iceconnectionstatechange) \
    235235    macro(icecandidate) \
    236236    macro(negotiationneeded) \
    237237    macro(datachannel) \
    238     macro(gatheringchange) \
    239238    macro(tonechange) \
    240239    \

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

    r140310 r146582  
    5454
    5555    enum IceConnectionState {
    56         IceConnectionStateStarting = 1,
     56        IceConnectionStateNew = 1,
    5757        IceConnectionStateChecking = 2,
    5858        IceConnectionStateConnected = 3,

  • trunk/Source/WebKit/chromium/ChangeLog

    r146572 r146582  
     12013-03-22  Tommy Widenflycht  <tommyw@google.com>
     2
     3        MediaStream API: Finalize the RTCPeerConnection states
     4        https://bugs.webkit.org/show_bug.cgi?id=112792
     5
     6        Reviewed by Adam Barth.
     7
     8        * src/AssertMatchingEnums.cpp:
     9
    1102013-03-22  Sheriff Bot  <webkit.review.bot@gmail.com>
    211

  • trunk/Source/WebKit/chromium/src/AssertMatchingEnums.cpp

    r145782 r146582  
    578578COMPILE_ASSERT_MATCHING_ENUM(WebRTCPeerConnectionHandlerClient::SignalingStateClosed, RTCPeerConnectionHandlerClient::SignalingStateClosed);
    579579
    580 COMPILE_ASSERT_MATCHING_ENUM(WebRTCPeerConnectionHandlerClient::ICEConnectionStateStarting, RTCPeerConnectionHandlerClient::IceConnectionStateStarting);
     580COMPILE_ASSERT_MATCHING_ENUM(WebRTCPeerConnectionHandlerClient::ICEConnectionStateStarting, RTCPeerConnectionHandlerClient::IceConnectionStateNew);
     581COMPILE_ASSERT_MATCHING_ENUM(WebRTCPeerConnectionHandlerClient::ICEConnectionStateNew, RTCPeerConnectionHandlerClient::IceConnectionStateNew);
    581582COMPILE_ASSERT_MATCHING_ENUM(WebRTCPeerConnectionHandlerClient::ICEConnectionStateChecking, RTCPeerConnectionHandlerClient::IceConnectionStateChecking);
    582583COMPILE_ASSERT_MATCHING_ENUM(WebRTCPeerConnectionHandlerClient::ICEConnectionStateConnected, RTCPeerConnectionHandlerClient::IceConnectionStateConnected);
Note: See TracChangeset for help on using the changeset viewer.