Changeset 134970 in webkit
- Timestamp:
- Nov 16, 2012 10:39:27 AM (11 years ago)
- Location:
- trunk
- Files:
-
- 11 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r134965 r134970 1 2012-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 1 11 2012-11-16 Robert Flack <flackr@chromium.org> 2 12 -
trunk/LayoutTests/fast/mediastream/RTCPeerConnection-datachannel-expected.txt
r134810 r134970 4 4 5 5 6 PASS pc_onopen was called7 PASS dc.readyState is 'connecting'8 6 PASS dc.reliable is true 9 7 PASS dc.reliable is true 10 8 PASS dc.reliable is true 11 9 PASS dc.reliable is false 10 PASS pc_onopen was called 11 PASS dc.readyState is 'connecting' 12 PASS pc_ondatachannel was called 13 PASS event.channel.readyState is 'open' 12 14 PASS dc_onopen was called 13 15 PASS dc.readyState is 'open' -
trunk/LayoutTests/fast/mediastream/RTCPeerConnection-datachannel.html
r134810 r134970 69 69 } 70 70 71 function pc_ondatachannel(e) { 72 testPassed("pc_ondatachannel was called"); 73 event = e; 74 shouldBe("event.channel.readyState", "'open'"); 75 } 76 71 77 function pc_onopen() { 72 78 testPassed("pc_onopen was called"); 73 dc = pc.createDataChannel("label 1");79 dc = pc.createDataChannel("label"); 74 80 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");85 81 dc.onopen = dc_onopen; 86 82 } 87 83 88 84 pc = new webkitRTCPeerConnection(null, null); 85 dc = pc.createDataChannel("label1"); 86 shouldBe("dc.reliable", "true"); 87 dc = pc.createDataChannel("label2", {}); 88 shouldBe("dc.reliable", "true"); 89 dc = pc.createDataChannel("label3", {reliable:true}); 90 shouldBe("dc.reliable", "true"); 91 dc = pc.createDataChannel("label3", {reliable:false}); 92 shouldBe("dc.reliable", "false"); 93 94 pc = new webkitRTCPeerConnection(null, null); 89 95 pc.onopen = pc_onopen; 96 pc.ondatachannel = pc_ondatachannel; 90 97 91 98 window.jsTestIsAsync = true; -
trunk/Source/Platform/ChangeLog
r134969 r134970 1 2012-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 1 11 2012-11-16 Scott Violet <sky@chromium.org> 2 12 -
trunk/Source/Platform/chromium/public/WebRTCPeerConnectionHandlerClient.h
r134810 r134970 34 34 namespace WebKit { 35 35 class WebMediaStreamDescriptor; 36 class WebRTCDataChannel; 36 37 class WebRTCICECandidate; 37 38 … … 65 66 virtual void didAddRemoteStream(const WebMediaStreamDescriptor&) = 0; 66 67 virtual void didRemoveRemoteStream(const WebMediaStreamDescriptor&) = 0; 68 virtual void didAddRemoteDataChannel(const WebRTCDataChannel&) { } 67 69 }; 68 70 -
trunk/Source/WebCore/ChangeLog
r134969 r134970 1 2012-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 1 20 2012-11-16 Scott Violet <sky@chromium.org> 2 21 -
trunk/Source/WebCore/platform/mediastream/RTCDataChannelDescriptor.cpp
r134810 r134970 37 37 38 38 RTCDataChannelDescriptor::RTCDataChannelDescriptor(const String& label, bool reliable) 39 : m_label(label) 39 : m_client(0) 40 , m_label(label) 40 41 , m_reliable(reliable) 41 42 , m_readyState(ReadyStateConnecting) … … 51 52 { 52 53 ASSERT(m_readyState != ReadyStateClosed); 53 if (m_readyState != readyState && m_client) {54 if (m_readyState != readyState) { 54 55 m_readyState = readyState; 55 m_client->readyStateChanged(); 56 if (m_client) 57 m_client->readyStateChanged(); 56 58 } 57 59 } -
trunk/Source/WebCore/platform/mediastream/chromium/RTCPeerConnectionHandlerChromium.cpp
r134810 r134970 204 204 } 205 205 206 void RTCPeerConnectionHandlerChromium::didAddRemoteDataChannel(const WebKit::WebRTCDataChannel& dataChannel) 207 { 208 m_client->didAddRemoteDataChannel(dataChannel); 209 } 210 206 211 } // namespace WebCore 207 212 -
trunk/Source/WebCore/platform/mediastream/chromium/RTCPeerConnectionHandlerChromium.h
r134810 r134970 43 43 namespace WebKit { 44 44 class WebMediaStreamDescriptor; 45 class WebRTCDataChannel; 45 46 class WebRTCICECandidate; 46 47 } … … 82 83 virtual void didAddRemoteStream(const WebKit::WebMediaStreamDescriptor&) OVERRIDE; 83 84 virtual void didRemoveRemoteStream(const WebKit::WebMediaStreamDescriptor&) OVERRIDE; 85 virtual void didAddRemoteDataChannel(const WebKit::WebRTCDataChannel&) OVERRIDE; 84 86 85 87 static WebKit::WebRTCPeerConnectionHandler* toWebRTCPeerConnectionHandler(RTCPeerConnectionHandler*); -
trunk/Tools/ChangeLog
r134967 r134970 1 2012-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 1 13 2012-11-16 Jochen Eisinger <jochen@chromium.org> 2 14 -
trunk/Tools/DumpRenderTree/chromium/MockWebRTCPeerConnectionHandler.cpp
r134810 r134970 338 338 return false; 339 339 340 WebRTCDataChannel remoteDataChannel; 341 remoteDataChannel.initialize("MockRemoteDataChannel", dataChannel.reliable()); 342 remoteDataChannel.readyStateChanged(WebRTCDataChannel::ReadyStateOpen); 343 m_client->didAddRemoteDataChannel(remoteDataChannel); 344 340 345 postTask(new DataChannelReadyStateTask(this, dataChannel, WebRTCDataChannel::ReadyStateOpen)); 341 346 return true;
Note: See TracChangeset
for help on using the changeset viewer.