Changeset 134976 in webkit


Ignore:
Timestamp:
Nov 16, 2012 11:36:26 AM (11 years ago)
Author:
tommyw@google.com
Message:

MediaStream API: Update RTCPeerConnection states to match the latest editors draft
​https://bugs.webkit.org/show_bug.cgi?id=102382

Reviewed by Adam Barth.

Source/Platform:

Adding a callback for the new RTCPeerConnection::iceGatheringState.

  • chromium/public/WebRTCPeerConnectionHandlerClient.h:

(WebKit::WebRTCPeerConnectionHandlerClient::didChangeICEGatheringState):

Source/WebCore:

Updating readyState & iceState, and adding iceGatheringState.
Also safeguarding the event timer callback.

Patch covered by existing tests.

  • Modules/mediastream/RTCPeerConnection.cpp:

(WebCore::RTCPeerConnection::RTCPeerConnection):
(WebCore::RTCPeerConnection::createOffer):
(WebCore::RTCPeerConnection::createAnswer):
(WebCore::RTCPeerConnection::setLocalDescription):
(WebCore::RTCPeerConnection::localDescription):
(WebCore::RTCPeerConnection::setRemoteDescription):
(WebCore::RTCPeerConnection::remoteDescription):
(WebCore::RTCPeerConnection::updateIce):
(WebCore::RTCPeerConnection::addIceCandidate):
(WebCore::RTCPeerConnection::readyState):
(WebCore::RTCPeerConnection::iceGatheringState):
(WebCore):
(WebCore::RTCPeerConnection::iceState):
(WebCore::RTCPeerConnection::addStream):
(WebCore::RTCPeerConnection::close):
(WebCore::RTCPeerConnection::didChangeIceGatheringState):
(WebCore::RTCPeerConnection::stop):
(WebCore::RTCPeerConnection::changeReadyState):
(WebCore::RTCPeerConnection::scheduledEventTimerFired):

  • Modules/mediastream/RTCPeerConnection.h:

(RTCPeerConnection):

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

(WebCore):

  • platform/mediastream/RTCPeerConnectionHandlerClient.h:

(RTCPeerConnectionHandlerClient):

  • platform/mediastream/chromium/RTCPeerConnectionHandlerChromium.cpp:

(WebCore::RTCPeerConnectionHandlerChromium::didChangeICEGatheringState):
(WebCore):

  • platform/mediastream/chromium/RTCPeerConnectionHandlerChromium.h:

(RTCPeerConnectionHandlerChromium):

Source/WebKit/chromium:

Updating readyState & iceState, and adding iceGatheringState.

  • src/AssertMatchingEnums.cpp:
Location:
trunk/Source
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/Platform/ChangeLog

    r134970 r134976  
     12012-11-16  Tommy Widenflycht  <tommyw@google.com>
     2
     3        MediaStream API: Update RTCPeerConnection states to match the latest editors draft
     4        https://bugs.webkit.org/show_bug.cgi?id=102382
     5
     6        Reviewed by Adam Barth.
     7
     8        Adding a callback for the new RTCPeerConnection::iceGatheringState.
     9
     10        * chromium/public/WebRTCPeerConnectionHandlerClient.h:
     11        (WebKit::WebRTCPeerConnectionHandlerClient::didChangeICEGatheringState):
     12
    1132012-11-16  Tommy Widenflycht  <tommyw@google.com>
    214

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

    r134970 r134976  
    4141    enum ReadyState {
    4242        ReadyStateNew = 1,
    43         ReadyStateOpening = 2,
    44         ReadyStateActive = 3,
    45         ReadyStateClosing = 4,
    46         ReadyStateClosed = 5
     43        ReadyStateHaveLocalOffer = 2,
     44        ReadyStateHaveLocalPrAnswer = 3,
     45        ReadyStateHaveRemotePrAnswer = 4,
     46        ReadyStateActive = 5,
     47        ReadyStateClosed = 6,
     48
     49        // DEPRECATED
     50        ReadyStateClosing = 7,
     51        ReadyStateOpening = 8
    4752    };
    4853
    4954    enum ICEState {
    50         ICEStateNew = 1,
    51         ICEStateGathering = 2,
    52         ICEStateWaiting = 3,
    53         ICEStateChecking = 4,
    54         ICEStateConnected = 5,
    55         ICEStateCompleted = 6,
    56         ICEStateFailed = 7,
    57         ICEStateClosed = 8
     55        ICEStateStarting = 1,
     56        ICEStateChecking = 2,
     57        ICEStateConnected = 3,
     58        ICEStateCompleted = 4,
     59        ICEStateFailed = 5,
     60        ICEStateDisconnected = 6,
     61        ICEStateClosed = 7,
     62
     63        // DEPRECATED
     64        ICEStateNew = 8,
     65        ICEStateGathering = 9,
     66        ICEStateWaiting = 10
     67    };
     68
     69    enum ICEGatheringState {
     70        ICEGatheringStateNew = 1,
     71        ICEGatheringStateGathering = 2,
     72        ICEGatheringStateComplete = 3
    5873    };
    5974
    … …  
    6378    virtual void didGenerateICECandidate(const WebRTCICECandidate&) = 0;
    6479    virtual void didChangeReadyState(ReadyState) = 0;
     80    virtual void didChangeICEGatheringState(ICEGatheringState) { }
    6581    virtual void didChangeICEState(ICEState) = 0;
    6682    virtual void didAddRemoteStream(const WebMediaStreamDescriptor&) = 0;

  • trunk/Source/WebCore/ChangeLog

    r134975 r134976  
     12012-11-16  Tommy Widenflycht  <tommyw@google.com>
     2
     3        MediaStream API: Update RTCPeerConnection states to match the latest editors draft
     4        https://bugs.webkit.org/show_bug.cgi?id=102382
     5
     6        Reviewed by Adam Barth.
     7
     8        Updating readyState & iceState, and adding iceGatheringState.
     9        Also safeguarding the event timer callback.
     10
     11        Patch covered by existing tests.
     12
     13        * Modules/mediastream/RTCPeerConnection.cpp:
     14        (WebCore::RTCPeerConnection::RTCPeerConnection):
     15        (WebCore::RTCPeerConnection::createOffer):
     16        (WebCore::RTCPeerConnection::createAnswer):
     17        (WebCore::RTCPeerConnection::setLocalDescription):
     18        (WebCore::RTCPeerConnection::localDescription):
     19        (WebCore::RTCPeerConnection::setRemoteDescription):
     20        (WebCore::RTCPeerConnection::remoteDescription):
     21        (WebCore::RTCPeerConnection::updateIce):
     22        (WebCore::RTCPeerConnection::addIceCandidate):
     23        (WebCore::RTCPeerConnection::readyState):
     24        (WebCore::RTCPeerConnection::iceGatheringState):
     25        (WebCore):
     26        (WebCore::RTCPeerConnection::iceState):
     27        (WebCore::RTCPeerConnection::addStream):
     28        (WebCore::RTCPeerConnection::close):
     29        (WebCore::RTCPeerConnection::didChangeIceGatheringState):
     30        (WebCore::RTCPeerConnection::stop):
     31        (WebCore::RTCPeerConnection::changeReadyState):
     32        (WebCore::RTCPeerConnection::scheduledEventTimerFired):
     33        * Modules/mediastream/RTCPeerConnection.h:
     34        (RTCPeerConnection):
     35        * Modules/mediastream/RTCPeerConnection.idl:
     36        * dom/EventNames.h:
     37        (WebCore):
     38        * platform/mediastream/RTCPeerConnectionHandlerClient.h:
     39        (RTCPeerConnectionHandlerClient):
     40        * platform/mediastream/chromium/RTCPeerConnectionHandlerChromium.cpp:
     41        (WebCore::RTCPeerConnectionHandlerChromium::didChangeICEGatheringState):
     42        (WebCore):
     43        * platform/mediastream/chromium/RTCPeerConnectionHandlerChromium.h:
     44        (RTCPeerConnectionHandlerChromium):
     45
    1462012-11-16  Dimitri Glazkov  <dglazkov@chromium.org>
    247

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

    r134810 r134976  
    132132    : ActiveDOMObject(context, this)
    133133    , m_readyState(ReadyStateNew)
    134     , m_iceState(IceStateClosed)
     134    , m_iceGatheringState(IceGatheringStateNew)
     135    , m_iceState(IceStateStarting)
    135136    , m_localStreams(MediaStreamList::create())
    136137    , m_remoteStreams(MediaStreamList::create())
    137138    , m_scheduledEventTimer(this, &RTCPeerConnection::scheduledEventTimerFired)
     139    , m_stopped(false)
    138140{
    139141    ASSERT(m_scriptExecutionContext->isDocument());
    … …  
    165167void RTCPeerConnection::createOffer(PassRefPtr<RTCSessionDescriptionCallback> successCallback, PassRefPtr<RTCErrorCallback> errorCallback, const Dictionary& mediaConstraints, ExceptionCode& ec)
    166168{
    167     if (m_readyState == ReadyStateClosing || m_readyState == ReadyStateClosed) {
     169    if (m_readyState == ReadyStateClosed) {
    168170        ec = INVALID_STATE_ERR;
    169171        return;
    … …  
    185187void RTCPeerConnection::createAnswer(PassRefPtr<RTCSessionDescriptionCallback> successCallback, PassRefPtr<RTCErrorCallback> errorCallback, const Dictionary& mediaConstraints, ExceptionCode& ec)
    186188{
    187     if (m_readyState == ReadyStateClosing || m_readyState == ReadyStateClosed) {
     189    if (m_readyState == ReadyStateClosed) {
    188190        ec = INVALID_STATE_ERR;
    189191        return;
    … …  
    205207void RTCPeerConnection::setLocalDescription(PassRefPtr<RTCSessionDescription> prpSessionDescription, PassRefPtr<VoidCallback> successCallback, PassRefPtr<RTCErrorCallback> errorCallback, ExceptionCode& ec)
    206208{
    207     if (m_readyState == ReadyStateClosing || m_readyState == ReadyStateClosed) {
     209    if (m_readyState == ReadyStateClosed) {
    208210        ec = INVALID_STATE_ERR;
    209211        return;
    … …  
    222224PassRefPtr<RTCSessionDescription> RTCPeerConnection::localDescription(ExceptionCode& ec)
    223225{
    224     if (m_readyState == ReadyStateClosing || m_readyState == ReadyStateClosed) {
     226    if (m_readyState == ReadyStateClosed) {
    225227        ec = INVALID_STATE_ERR;
    226228        return 0;
    … …  
    237239void RTCPeerConnection::setRemoteDescription(PassRefPtr<RTCSessionDescription> prpSessionDescription, PassRefPtr<VoidCallback> successCallback, PassRefPtr<RTCErrorCallback> errorCallback, ExceptionCode& ec)
    238240{
    239     if (m_readyState == ReadyStateClosing || m_readyState == ReadyStateClosed) {
     241    if (m_readyState == ReadyStateClosed) {
    240242        ec = INVALID_STATE_ERR;
    241243        return;
    … …  
    254256PassRefPtr<RTCSessionDescription> RTCPeerConnection::remoteDescription(ExceptionCode& ec)
    255257{
    256     if (m_readyState == ReadyStateClosing || m_readyState == ReadyStateClosed) {
     258    if (m_readyState == ReadyStateClosed) {
    257259        ec = INVALID_STATE_ERR;
    258260        return 0;
    … …  
    269271void RTCPeerConnection::updateIce(const Dictionary& rtcConfiguration, const Dictionary& mediaConstraints, ExceptionCode& ec)
    270272{
    271     if (m_readyState == ReadyStateClosing || m_readyState == ReadyStateClosed) {
     273    if (m_readyState == ReadyStateClosed) {
    272274        ec = INVALID_STATE_ERR;
    273275        return;
    … …  
    289291void RTCPeerConnection::addIceCandidate(RTCIceCandidate* iceCandidate, ExceptionCode& ec)
    290292{
    291     if (m_readyState == ReadyStateClosing || m_readyState == ReadyStateClosed) {
     293    if (m_readyState == ReadyStateClosed) {
    292294        ec = INVALID_STATE_ERR;
    293295        return;
    … …  
    309311    case ReadyStateNew:
    310312        return ASCIILiteral("new");
     313    case ReadyStateHaveLocalOffer:
     314        return ASCIILiteral("have-local-offer");
     315    case ReadyStateHaveLocalPrAnswer:
     316        return ASCIILiteral("have-local-pranswer");
     317    case ReadyStateHaveRemotePrAnswer:
     318        return ASCIILiteral("have-remote-pranswer");
     319    case ReadyStateActive:
     320        return ASCIILiteral("active");
     321    case ReadyStateClosed:
     322        return ASCIILiteral("closed");
     323
     324    // DEPRECATED
    311325    case ReadyStateOpening:
    312326        return ASCIILiteral("opening");
    313     case ReadyStateActive:
    314         return ASCIILiteral("active");
    315327    case ReadyStateClosing:
    316328        return ASCIILiteral("closing");
    317     case ReadyStateClosed:
    318         return ASCIILiteral("closed");
    319329    }
    320330
    321331    ASSERT_NOT_REACHED();
    322     return ASCIILiteral("");
     332    return String();
     333}
     334
     335String RTCPeerConnection::iceGatheringState() const
     336{
     337    switch (m_iceGatheringState) {
     338    case IceGatheringStateNew:
     339        return ASCIILiteral("new");
     340    case IceGatheringStateGathering:
     341        return ASCIILiteral("gathering");
     342    case IceGatheringStateComplete:
     343        return ASCIILiteral("complete");
     344    }
     345
     346    ASSERT_NOT_REACHED();
     347    return String();
    323348}
    324349
    … …  
    326351{
    327352    switch (m_iceState) {
    328     case IceStateNew:
    329         return ASCIILiteral("new");
    330     case IceStateGathering:
    331         return ASCIILiteral("gathering");
    332     case IceStateWaiting:
    333         return ASCIILiteral("waiting");
     353    case IceStateStarting:
     354        return ASCIILiteral("starting");
    334355    case IceStateChecking:
    335356        return ASCIILiteral("checking");
    … …  
    340361    case IceStateFailed:
    341362        return ASCIILiteral("failed");
     363    case IceStateDisconnected:
     364        return ASCIILiteral("disconnected");
    342365    case IceStateClosed:
    343366        return ASCIILiteral("closed");
     367
     368    // DEPRECATED
     369    case IceStateNew:
     370        return ASCIILiteral("new");
     371    case IceStateGathering:
     372        return ASCIILiteral("gathering");
     373    case IceStateWaiting:
     374        return ASCIILiteral("waiting");
    344375    }
    345376
    … …  
    350381void RTCPeerConnection::addStream(PassRefPtr<MediaStream> prpStream, const Dictionary& mediaConstraints, ExceptionCode& ec)
    351382{
    352     if (m_readyState == ReadyStateClosing || m_readyState == ReadyStateClosed) {
     383    if (m_readyState == ReadyStateClosed) {
    353384        ec = INVALID_STATE_ERR;
    354385        return;
    … …  
    430461void RTCPeerConnection::close(ExceptionCode& ec)
    431462{
    432     if (m_readyState == ReadyStateClosing || m_readyState == ReadyStateClosed) {
     463    if (m_readyState == ReadyStateClosed) {
    433464        ec = INVALID_STATE_ERR;
    434465        return;
    … …  
    463494}
    464495
     496void RTCPeerConnection::didChangeIceGatheringState(IceGatheringState newState)
     497{
     498    ASSERT(scriptExecutionContext()->isContextThread());
     499    if (newState == m_iceGatheringState || m_readyState == ReadyStateClosed)
     500        return;
     501
     502    m_iceGatheringState = newState;
     503    scheduleDispatchEvent(Event::create(eventNames().gatheringchangeEvent, false, false));
     504}
     505
    465506void RTCPeerConnection::didChangeIceState(IceState newState)
    466507{
    … …  
    524565void RTCPeerConnection::stop()
    525566{
     567    m_stopped = true;
    526568    m_iceState = IceStateClosed;
    527569    m_readyState = ReadyStateClosed;
    … …  
    544586void RTCPeerConnection::changeReadyState(ReadyState readyState)
    545587{
     588    if (readyState == ReadyStateNew) {
     589        ASSERT_NOT_REACHED();
     590        return;
     591    }
     592
    546593    if (readyState == m_readyState || m_readyState == ReadyStateClosed)
    547594        return;
    … …  
    549596    m_readyState = readyState;
    550597
    551     switch (m_readyState) {
    552     case ReadyStateOpening:
    553         break;
    554     case ReadyStateActive:
     598    if (m_readyState == ReadyStateActive)
    555599        scheduleDispatchEvent(Event::create(eventNames().openEvent, false, false));
    556         break;
    557     case ReadyStateClosing:
    558     case ReadyStateClosed:
    559         break;
    560     case ReadyStateNew:
    561         ASSERT_NOT_REACHED();
    562         break;
    563     }
    564600
    565601    scheduleDispatchEvent(Event::create(eventNames().statechangeEvent, false, false));
    … …  
    585621void RTCPeerConnection::scheduledEventTimerFired(Timer<RTCPeerConnection>*)
    586622{
     623    if (m_stopped)
     624        return;
     625
    587626    Vector<RefPtr<Event> > events;
    588627    events.swap(m_scheduledEvents);

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

    r134810 r134976  
    7979    void addIceCandidate(RTCIceCandidate*, ExceptionCode&);
    8080
     81    String iceGatheringState() const;
     82
    8183    String iceState() const;
    8284
    … …  
    101103    DEFINE_ATTRIBUTE_EVENT_LISTENER(addstream);
    102104    DEFINE_ATTRIBUTE_EVENT_LISTENER(removestream);
     105    DEFINE_ATTRIBUTE_EVENT_LISTENER(gatheringchange);
    103106    DEFINE_ATTRIBUTE_EVENT_LISTENER(icechange);
    104107    DEFINE_ATTRIBUTE_EVENT_LISTENER(datachannel);
    … …  
    108111    virtual void didGenerateIceCandidate(PassRefPtr<RTCIceCandidateDescriptor>) OVERRIDE;
    109112    virtual void didChangeReadyState(ReadyState) OVERRIDE;
     113    virtual void didChangeIceGatheringState(IceGatheringState) OVERRIDE;
    110114    virtual void didChangeIceState(IceState) OVERRIDE;
    111115    virtual void didAddRemoteStream(PassRefPtr<MediaStreamDescriptor>) OVERRIDE;
    … …  
    141145
    142146    ReadyState m_readyState;
     147    IceGatheringState m_iceGatheringState;
    143148    IceState m_iceState;
    144149
    … …  
    152157    Timer<RTCPeerConnection> m_scheduledEventTimer;
    153158    Vector<RefPtr<Event> > m_scheduledEvents;
     159
     160    bool m_stopped;
    154161};
    155162

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

    r134810 r134976  
    6161        raises(DOMException);
    6262
     63    readonly attribute DOMString iceGatheringState;
    6364    readonly attribute DOMString iceState;
    6465
    … …  
    8586    attribute EventListener onaddstream;
    8687    attribute EventListener onremovestream;
     88    attribute EventListener ongatheringchange;
    8789    attribute EventListener onicechange;
    8890    attribute EventListener ondatachannel;

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

    r134810 r134976  
    230230    macro(negotiationneeded) \
    231231    macro(datachannel) \
     232    macro(gatheringchange) \
    232233    \
    233234    macro(show) \

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

    r134810 r134976  
    4646    enum ReadyState {
    4747        ReadyStateNew = 1,
    48         ReadyStateOpening = 2,
    49         ReadyStateActive = 3,
    50         ReadyStateClosing = 4,
    51         ReadyStateClosed = 5
     48        ReadyStateHaveLocalOffer = 2,
     49        ReadyStateHaveLocalPrAnswer = 3,
     50        ReadyStateHaveRemotePrAnswer = 4,
     51        ReadyStateActive = 5,
     52        ReadyStateClosed = 6,
     53
     54        // DEPRECATED
     55        ReadyStateClosing = 7,
     56        ReadyStateOpening = 8
    5257    };
    5358
    5459    enum IceState {
    55         IceStateNew = 1,
    56         IceStateGathering = 2,
    57         IceStateWaiting = 3,
    58         IceStateChecking = 4,
    59         IceStateConnected = 5,
    60         IceStateCompleted = 6,
    61         IceStateFailed = 7,
    62         IceStateClosed = 8
     60        IceStateStarting = 1,
     61        IceStateChecking = 2,
     62        IceStateConnected = 3,
     63        IceStateCompleted = 4,
     64        IceStateFailed = 5,
     65        IceStateDisconnected = 6,
     66        IceStateClosed = 7,
     67
     68        // DEPRECATED
     69        IceStateNew = 8,
     70        IceStateGathering = 9,
     71        IceStateWaiting = 10
     72    };
     73
     74    enum IceGatheringState {
     75        IceGatheringStateNew = 1,
     76        IceGatheringStateGathering = 2,
     77        IceGatheringStateComplete = 3
    6378    };
    6479
    … …  
    6883    virtual void didGenerateIceCandidate(PassRefPtr<RTCIceCandidateDescriptor>) = 0;
    6984    virtual void didChangeReadyState(ReadyState) = 0;
     85    virtual void didChangeIceGatheringState(IceGatheringState) = 0;
    7086    virtual void didChangeIceState(IceState) = 0;
    7187    virtual void didAddRemoteStream(PassRefPtr<MediaStreamDescriptor>) = 0;

  • trunk/Source/WebCore/platform/mediastream/chromium/RTCPeerConnectionHandlerChromium.cpp

    r134970 r134976  
    189189}
    190190
     191void RTCPeerConnectionHandlerChromium::didChangeICEGatheringState(WebKit::WebRTCPeerConnectionHandlerClient::ICEGatheringState state)
     192{
     193    m_client->didChangeIceGatheringState(static_cast<RTCPeerConnectionHandlerClient::IceGatheringState>(state));
     194}
     195
    191196void RTCPeerConnectionHandlerChromium::didChangeICEState(WebKit::WebRTCPeerConnectionHandlerClient::ICEState state)
    192197{

  • trunk/Source/WebCore/platform/mediastream/chromium/RTCPeerConnectionHandlerChromium.h

    r134970 r134976  
    8080    virtual void didGenerateICECandidate(const WebKit::WebRTCICECandidate&) OVERRIDE;
    8181    virtual void didChangeReadyState(WebKit::WebRTCPeerConnectionHandlerClient::ReadyState) OVERRIDE;
     82    virtual void didChangeICEGatheringState(WebKit::WebRTCPeerConnectionHandlerClient::ICEGatheringState) OVERRIDE;
    8283    virtual void didChangeICEState(WebKit::WebRTCPeerConnectionHandlerClient::ICEState) OVERRIDE;
    8384    virtual void didAddRemoteStream(const WebKit::WebMediaStreamDescriptor&) OVERRIDE;

  • trunk/Source/WebKit/chromium/ChangeLog

    r134975 r134976  
     12012-11-16  Tommy Widenflycht  <tommyw@google.com>
     2
     3        MediaStream API: Update RTCPeerConnection states to match the latest editors draft
     4        https://bugs.webkit.org/show_bug.cgi?id=102382
     5
     6        Reviewed by Adam Barth.
     7
     8        Updating readyState & iceState, and adding iceGatheringState.
     9
     10        * src/AssertMatchingEnums.cpp:
     11
    1122012-11-16  Dimitri Glazkov  <dglazkov@chromium.org>
    213

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

    r134810 r134976  
    564564
    565565COMPILE_ASSERT_MATCHING_ENUM(WebRTCPeerConnectionHandlerClient::ReadyStateNew, RTCPeerConnectionHandlerClient::ReadyStateNew);
     566COMPILE_ASSERT_MATCHING_ENUM(WebRTCPeerConnectionHandlerClient::ReadyStateHaveLocalOffer, RTCPeerConnectionHandlerClient::ReadyStateHaveLocalOffer);
     567COMPILE_ASSERT_MATCHING_ENUM(WebRTCPeerConnectionHandlerClient::ReadyStateHaveLocalPrAnswer, RTCPeerConnectionHandlerClient::ReadyStateHaveLocalPrAnswer);
     568COMPILE_ASSERT_MATCHING_ENUM(WebRTCPeerConnectionHandlerClient::ReadyStateHaveRemotePrAnswer, RTCPeerConnectionHandlerClient::ReadyStateHaveRemotePrAnswer);
     569COMPILE_ASSERT_MATCHING_ENUM(WebRTCPeerConnectionHandlerClient::ReadyStateActive, RTCPeerConnectionHandlerClient::ReadyStateActive);
     570COMPILE_ASSERT_MATCHING_ENUM(WebRTCPeerConnectionHandlerClient::ReadyStateClosed, RTCPeerConnectionHandlerClient::ReadyStateClosed);
     571
     572// DEPRECATED
    566573COMPILE_ASSERT_MATCHING_ENUM(WebRTCPeerConnectionHandlerClient::ReadyStateOpening, RTCPeerConnectionHandlerClient::ReadyStateOpening);
    567 COMPILE_ASSERT_MATCHING_ENUM(WebRTCPeerConnectionHandlerClient::ReadyStateActive, RTCPeerConnectionHandlerClient::ReadyStateActive);
    568574COMPILE_ASSERT_MATCHING_ENUM(WebRTCPeerConnectionHandlerClient::ReadyStateClosing, RTCPeerConnectionHandlerClient::ReadyStateClosing);
    569 COMPILE_ASSERT_MATCHING_ENUM(WebRTCPeerConnectionHandlerClient::ReadyStateClosed, RTCPeerConnectionHandlerClient::ReadyStateClosed);
    570 
    571 COMPILE_ASSERT_MATCHING_ENUM(WebRTCPeerConnectionHandlerClient::ICEStateNew, RTCPeerConnectionHandlerClient::IceStateNew);
    572 COMPILE_ASSERT_MATCHING_ENUM(WebRTCPeerConnectionHandlerClient::ICEStateGathering, RTCPeerConnectionHandlerClient::IceStateGathering);
    573 COMPILE_ASSERT_MATCHING_ENUM(WebRTCPeerConnectionHandlerClient::ICEStateWaiting, RTCPeerConnectionHandlerClient::IceStateWaiting);
     575
     576
     577COMPILE_ASSERT_MATCHING_ENUM(WebRTCPeerConnectionHandlerClient::ICEStateStarting, RTCPeerConnectionHandlerClient::IceStateStarting);
    574578COMPILE_ASSERT_MATCHING_ENUM(WebRTCPeerConnectionHandlerClient::ICEStateChecking, RTCPeerConnectionHandlerClient::IceStateChecking);
    575579COMPILE_ASSERT_MATCHING_ENUM(WebRTCPeerConnectionHandlerClient::ICEStateConnected, RTCPeerConnectionHandlerClient::IceStateConnected);
    576580COMPILE_ASSERT_MATCHING_ENUM(WebRTCPeerConnectionHandlerClient::ICEStateCompleted, RTCPeerConnectionHandlerClient::IceStateCompleted);
    577581COMPILE_ASSERT_MATCHING_ENUM(WebRTCPeerConnectionHandlerClient::ICEStateFailed, RTCPeerConnectionHandlerClient::IceStateFailed);
     582COMPILE_ASSERT_MATCHING_ENUM(WebRTCPeerConnectionHandlerClient::ICEStateDisconnected, RTCPeerConnectionHandlerClient::IceStateDisconnected);
    578583COMPILE_ASSERT_MATCHING_ENUM(WebRTCPeerConnectionHandlerClient::ICEStateClosed, RTCPeerConnectionHandlerClient::IceStateClosed);
     584
     585// DEPRECATED
     586COMPILE_ASSERT_MATCHING_ENUM(WebRTCPeerConnectionHandlerClient::ICEStateNew, RTCPeerConnectionHandlerClient::IceStateNew);
     587COMPILE_ASSERT_MATCHING_ENUM(WebRTCPeerConnectionHandlerClient::ICEStateGathering, RTCPeerConnectionHandlerClient::IceStateGathering);
     588COMPILE_ASSERT_MATCHING_ENUM(WebRTCPeerConnectionHandlerClient::ICEStateWaiting, RTCPeerConnectionHandlerClient::IceStateWaiting);
    579589
    580590COMPILE_ASSERT_MATCHING_ENUM(WebRTCDataChannel::ReadyStateConnecting, RTCDataChannelDescriptor::ReadyStateConnecting);
Note: See TracChangeset for help on using the changeset viewer.