Changeset 134970 in webkit


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

[chromium] MediaStream API: Add missing WebRTCPeerConnectionHandlerClient::didAddRemoteDataChannel
https://bugs.webkit.org/show_bug.cgi?id=102386

Reviewed by Adam Barth.

Source/Platform:

  • chromium/public/WebRTCPeerConnectionHandlerClient.h:

(WebRTCPeerConnectionHandlerClient):

Source/WebCore:

Existing tests expanded to cover patch.

  • platform/mediastream/RTCDataChannelDescriptor.cpp:

(WebCore::RTCDataChannelDescriptor::RTCDataChannelDescriptor):
(WebCore::RTCDataChannelDescriptor::readyStateChanged):

  • platform/mediastream/chromium/RTCPeerConnectionHandlerChromium.cpp:

(WebCore::RTCPeerConnectionHandlerChromium::didAddRemoteDataChannel):
(WebCore):

  • platform/mediastream/chromium/RTCPeerConnectionHandlerChromium.h:

(WebKit):
(RTCPeerConnectionHandlerChromium):

Tools:

Adding mock data channel functionality.

  • DumpRenderTree/chromium/MockWebRTCPeerConnectionHandler.cpp:

(MockWebRTCPeerConnectionHandler::openDataChannel):

LayoutTests:

  • fast/mediastream/RTCPeerConnection-datachannel.html:
  • fast/mediastream/RTCPeerConnection-datachannel-expected.txt:
Location:
trunk
Files:
11 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r134965 r134970  
     12012-11-16  Tommy Widenflycht  <tommyw@google.com>
     2
     3        [chromium] MediaStream API: Add missing WebRTCPeerConnectionHandlerClient::didAddRemoteDataChannel
     4        https://bugs.webkit.org/show_bug.cgi?id=102386
     5
     6        Reviewed by Adam Barth.
     7
     8        * fast/mediastream/RTCPeerConnection-datachannel.html:
     9        * fast/mediastream/RTCPeerConnection-datachannel-expected.txt:
     10
    1112012-11-16  Robert Flack  <flackr@chromium.org>
    212
  • trunk/LayoutTests/fast/mediastream/RTCPeerConnection-datachannel-expected.txt

    r134810 r134970  
    44
    55
    6 PASS pc_onopen was called
    7 PASS dc.readyState is 'connecting'
    86PASS dc.reliable is true
    97PASS dc.reliable is true
    108PASS dc.reliable is true
    119PASS dc.reliable is false
     10PASS pc_onopen was called
     11PASS dc.readyState is 'connecting'
     12PASS pc_ondatachannel was called
     13PASS event.channel.readyState is 'open'
    1214PASS dc_onopen was called
    1315PASS dc.readyState is 'open'
  • trunk/LayoutTests/fast/mediastream/RTCPeerConnection-datachannel.html

    r134810 r134970  
    6969}
    7070
     71function pc_ondatachannel(e) {
     72    testPassed("pc_ondatachannel was called");
     73    event = e;
     74    shouldBe("event.channel.readyState", "'open'");
     75}
     76
    7177function pc_onopen() {
    7278    testPassed("pc_onopen was called");
    73     dc = pc.createDataChannel("label1");
     79    dc = pc.createDataChannel("label");
    7480    shouldBe("dc.readyState", "'connecting'");
    75     shouldBe("dc.reliable", "true");
    76 
    77     dc = pc.createDataChannel("label2", {});
    78     shouldBe("dc.reliable", "true");
    79 
    80     dc = pc.createDataChannel("label3", {reliable:true});
    81     shouldBe("dc.reliable", "true");
    82 
    83     dc = pc.createDataChannel("label", {reliable:false});
    84     shouldBe("dc.reliable", "false");
    8581    dc.onopen = dc_onopen;
    8682}
    8783
    8884pc = new webkitRTCPeerConnection(null, null);
     85dc = pc.createDataChannel("label1");
     86shouldBe("dc.reliable", "true");
     87dc = pc.createDataChannel("label2", {});
     88shouldBe("dc.reliable", "true");
     89dc = pc.createDataChannel("label3", {reliable:true});
     90shouldBe("dc.reliable", "true");
     91dc = pc.createDataChannel("label3", {reliable:false});
     92shouldBe("dc.reliable", "false");
     93
     94pc = new webkitRTCPeerConnection(null, null);
    8995pc.onopen = pc_onopen;
     96pc.ondatachannel = pc_ondatachannel;
    9097
    9198window.jsTestIsAsync = true;
  • trunk/Source/Platform/ChangeLog

    r134969 r134970  
     12012-11-16  Tommy Widenflycht  <tommyw@google.com>
     2
     3        [chromium] MediaStream API: Add missing WebRTCPeerConnectionHandlerClient::didAddRemoteDataChannel
     4        https://bugs.webkit.org/show_bug.cgi?id=102386
     5
     6        Reviewed by Adam Barth.
     7
     8        * chromium/public/WebRTCPeerConnectionHandlerClient.h:
     9        (WebRTCPeerConnectionHandlerClient):
     10
    1112012-11-16  Scott Violet  <sky@chromium.org>
    212
  • trunk/Source/Platform/chromium/public/WebRTCPeerConnectionHandlerClient.h

    r134810 r134970  
    3434namespace WebKit {
    3535class WebMediaStreamDescriptor;
     36class WebRTCDataChannel;
    3637class WebRTCICECandidate;
    3738
     
    6566    virtual void didAddRemoteStream(const WebMediaStreamDescriptor&) = 0;
    6667    virtual void didRemoveRemoteStream(const WebMediaStreamDescriptor&) = 0;
     68    virtual void didAddRemoteDataChannel(const WebRTCDataChannel&) { }
    6769};
    6870
  • trunk/Source/WebCore/ChangeLog

    r134969 r134970  
     12012-11-16  Tommy Widenflycht  <tommyw@google.com>
     2
     3        [chromium] MediaStream API: Add missing WebRTCPeerConnectionHandlerClient::didAddRemoteDataChannel
     4        https://bugs.webkit.org/show_bug.cgi?id=102386
     5
     6        Reviewed by Adam Barth.
     7
     8        Existing tests expanded to cover patch.
     9
     10        * platform/mediastream/RTCDataChannelDescriptor.cpp:
     11        (WebCore::RTCDataChannelDescriptor::RTCDataChannelDescriptor):
     12        (WebCore::RTCDataChannelDescriptor::readyStateChanged):
     13        * platform/mediastream/chromium/RTCPeerConnectionHandlerChromium.cpp:
     14        (WebCore::RTCPeerConnectionHandlerChromium::didAddRemoteDataChannel):
     15        (WebCore):
     16        * platform/mediastream/chromium/RTCPeerConnectionHandlerChromium.h:
     17        (WebKit):
     18        (RTCPeerConnectionHandlerChromium):
     19
    1202012-11-16  Scott Violet  <sky@chromium.org>
    221
  • trunk/Source/WebCore/platform/mediastream/RTCDataChannelDescriptor.cpp

    r134810 r134970  
    3737
    3838RTCDataChannelDescriptor::RTCDataChannelDescriptor(const String& label, bool reliable)
    39     : m_label(label)
     39    : m_client(0)
     40    , m_label(label)
    4041    , m_reliable(reliable)
    4142    , m_readyState(ReadyStateConnecting)
     
    5152{
    5253    ASSERT(m_readyState != ReadyStateClosed);
    53     if (m_readyState != readyState && m_client) {
     54    if (m_readyState != readyState) {
    5455        m_readyState = readyState;
    55         m_client->readyStateChanged();
     56        if (m_client)
     57            m_client->readyStateChanged();
    5658    }
    5759}
  • trunk/Source/WebCore/platform/mediastream/chromium/RTCPeerConnectionHandlerChromium.cpp

    r134810 r134970  
    204204}
    205205
     206void RTCPeerConnectionHandlerChromium::didAddRemoteDataChannel(const WebKit::WebRTCDataChannel& dataChannel)
     207{
     208    m_client->didAddRemoteDataChannel(dataChannel);
     209}
     210
    206211} // namespace WebCore
    207212
  • trunk/Source/WebCore/platform/mediastream/chromium/RTCPeerConnectionHandlerChromium.h

    r134810 r134970  
    4343namespace WebKit {
    4444class WebMediaStreamDescriptor;
     45class WebRTCDataChannel;
    4546class WebRTCICECandidate;
    4647}
     
    8283    virtual void didAddRemoteStream(const WebKit::WebMediaStreamDescriptor&) OVERRIDE;
    8384    virtual void didRemoveRemoteStream(const WebKit::WebMediaStreamDescriptor&) OVERRIDE;
     85    virtual void didAddRemoteDataChannel(const WebKit::WebRTCDataChannel&) OVERRIDE;
    8486
    8587    static WebKit::WebRTCPeerConnectionHandler* toWebRTCPeerConnectionHandler(RTCPeerConnectionHandler*);
  • trunk/Tools/ChangeLog

    r134967 r134970  
     12012-11-16  Tommy Widenflycht  <tommyw@google.com>
     2
     3        [chromium] MediaStream API: Add missing WebRTCPeerConnectionHandlerClient::didAddRemoteDataChannel
     4        https://bugs.webkit.org/show_bug.cgi?id=102386
     5
     6        Reviewed by Adam Barth.
     7
     8        Adding mock data channel functionality.
     9
     10        * DumpRenderTree/chromium/MockWebRTCPeerConnectionHandler.cpp:
     11        (MockWebRTCPeerConnectionHandler::openDataChannel):
     12
    1132012-11-16  Jochen Eisinger  <jochen@chromium.org>
    214
  • trunk/Tools/DumpRenderTree/chromium/MockWebRTCPeerConnectionHandler.cpp

    r134810 r134970  
    338338        return false;
    339339
     340    WebRTCDataChannel remoteDataChannel;
     341    remoteDataChannel.initialize("MockRemoteDataChannel", dataChannel.reliable());
     342    remoteDataChannel.readyStateChanged(WebRTCDataChannel::ReadyStateOpen);
     343    m_client->didAddRemoteDataChannel(remoteDataChannel);
     344
    340345    postTask(new DataChannelReadyStateTask(this, dataChannel, WebRTCDataChannel::ReadyStateOpen));
    341346    return true;
Note: See TracChangeset for help on using the changeset viewer.