Diff
Modified: trunk/LayoutTests/ChangeLog (134804 => 134805)
--- trunk/LayoutTests/ChangeLog 2012-11-15 19:20:16 UTC (rev 134804)
+++ trunk/LayoutTests/ChangeLog 2012-11-15 19:22:49 UTC (rev 134805)
@@ -1,3 +1,13 @@
+2012-11-15 Tommy Widenflycht <[email protected]>
+
+ [chromium] MediaStream API: Add missing WebRTCPeerConnectionHandlerClient::didAddRemoteDataChannel
+ https://bugs.webkit.org/show_bug.cgi?id=102386
+
+ Reviewed by Adam Barth.
+
+ * fast/mediastream/RTCPeerConnection-datachannel.html:
+ * fast/mediastream/RTCPeerConnection-datachannel-expected.txt:
+
2012-11-15 Rick Byers <[email protected]>
No tests for changing mouse cursors
Modified: trunk/LayoutTests/fast/mediastream/RTCPeerConnection-datachannel-expected.txt (134804 => 134805)
--- trunk/LayoutTests/fast/mediastream/RTCPeerConnection-datachannel-expected.txt 2012-11-15 19:20:16 UTC (rev 134804)
+++ trunk/LayoutTests/fast/mediastream/RTCPeerConnection-datachannel-expected.txt 2012-11-15 19:22:49 UTC (rev 134805)
@@ -3,12 +3,14 @@
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-PASS pc_onopen was called
-PASS dc.readyState is 'connecting'
PASS dc.reliable is true
PASS dc.reliable is true
PASS dc.reliable is true
PASS dc.reliable is false
+PASS pc_onopen was called
+PASS dc.readyState is 'connecting'
+PASS pc_ondatachannel was called
+PASS event.channel.readyState is 'open'
PASS dc_onopen was called
PASS dc.readyState is 'open'
PASS dc.label is 'label'
Modified: trunk/LayoutTests/fast/mediastream/RTCPeerConnection-datachannel.html (134804 => 134805)
--- trunk/LayoutTests/fast/mediastream/RTCPeerConnection-datachannel.html 2012-11-15 19:20:16 UTC (rev 134804)
+++ trunk/LayoutTests/fast/mediastream/RTCPeerConnection-datachannel.html 2012-11-15 19:22:49 UTC (rev 134805)
@@ -68,25 +68,32 @@
shouldNotThrow("dc.send('xyzzy');");
}
+function pc_ondatachannel(e) {
+ testPassed("pc_ondatachannel was called");
+ event = e;
+ shouldBe("event.channel.readyState", "'open'");
+}
+
function pc_onopen() {
testPassed("pc_onopen was called");
- dc = pc.createDataChannel("label1");
+ dc = pc.createDataChannel("label");
shouldBe("dc.readyState", "'connecting'");
- shouldBe("dc.reliable", "true");
-
- dc = pc.createDataChannel("label2", {});
- shouldBe("dc.reliable", "true");
-
- dc = pc.createDataChannel("label3", {reliable:true});
- shouldBe("dc.reliable", "true");
-
- dc = pc.createDataChannel("label", {reliable:false});
- shouldBe("dc.reliable", "false");
dc._onopen_ = dc_onopen;
}
pc = new webkitRTCPeerConnection(null, null);
+dc = pc.createDataChannel("label1");
+shouldBe("dc.reliable", "true");
+dc = pc.createDataChannel("label2", {});
+shouldBe("dc.reliable", "true");
+dc = pc.createDataChannel("label3", {reliable:true});
+shouldBe("dc.reliable", "true");
+dc = pc.createDataChannel("label3", {reliable:false});
+shouldBe("dc.reliable", "false");
+
+pc = new webkitRTCPeerConnection(null, null);
pc._onopen_ = pc_onopen;
+pc._ondatachannel_ = pc_ondatachannel;
window.jsTestIsAsync = true;
window.successfullyParsed = true;
Modified: trunk/Source/Platform/ChangeLog (134804 => 134805)
--- trunk/Source/Platform/ChangeLog 2012-11-15 19:20:16 UTC (rev 134804)
+++ trunk/Source/Platform/ChangeLog 2012-11-15 19:22:49 UTC (rev 134805)
@@ -1,5 +1,15 @@
2012-11-15 Tommy Widenflycht <[email protected]>
+ [chromium] MediaStream API: Add missing WebRTCPeerConnectionHandlerClient::didAddRemoteDataChannel
+ https://bugs.webkit.org/show_bug.cgi?id=102386
+
+ Reviewed by Adam Barth.
+
+ * chromium/public/WebRTCPeerConnectionHandlerClient.h:
+ (WebRTCPeerConnectionHandlerClient):
+
+2012-11-15 Tommy Widenflycht <[email protected]>
+
MediaStream API: Update RTCPeerConnection states to match the latest editors draft
https://bugs.webkit.org/show_bug.cgi?id=102382
Modified: trunk/Source/Platform/chromium/public/WebRTCPeerConnectionHandlerClient.h (134804 => 134805)
--- trunk/Source/Platform/chromium/public/WebRTCPeerConnectionHandlerClient.h 2012-11-15 19:20:16 UTC (rev 134804)
+++ trunk/Source/Platform/chromium/public/WebRTCPeerConnectionHandlerClient.h 2012-11-15 19:22:49 UTC (rev 134805)
@@ -80,6 +80,7 @@
virtual void didChangeICEState(ICEState) = 0;
virtual void didAddRemoteStream(const WebMediaStreamDescriptor&) = 0;
virtual void didRemoveRemoteStream(const WebMediaStreamDescriptor&) = 0;
+ virtual void didAddRemoteDataChannel(const WebRTCDataChannel&) = 0;
};
} // namespace WebKit
Modified: trunk/Source/WebCore/ChangeLog (134804 => 134805)
--- trunk/Source/WebCore/ChangeLog 2012-11-15 19:20:16 UTC (rev 134804)
+++ trunk/Source/WebCore/ChangeLog 2012-11-15 19:22:49 UTC (rev 134805)
@@ -1,3 +1,22 @@
+2012-11-15 Tommy Widenflycht <[email protected]>
+
+ [chromium] MediaStream API: Add missing WebRTCPeerConnectionHandlerClient::didAddRemoteDataChannel
+ https://bugs.webkit.org/show_bug.cgi?id=102386
+
+ Reviewed by Adam Barth.
+
+ 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):
+
2012-11-15 Rick Byers <[email protected]>
No tests for changing mouse cursors
Modified: trunk/Source/WebCore/platform/mediastream/RTCDataChannelDescriptor.cpp (134804 => 134805)
--- trunk/Source/WebCore/platform/mediastream/RTCDataChannelDescriptor.cpp 2012-11-15 19:20:16 UTC (rev 134804)
+++ trunk/Source/WebCore/platform/mediastream/RTCDataChannelDescriptor.cpp 2012-11-15 19:22:49 UTC (rev 134805)
@@ -36,7 +36,8 @@
}
RTCDataChannelDescriptor::RTCDataChannelDescriptor(const String& label, bool reliable)
- : m_label(label)
+ : m_client(0)
+ , m_label(label)
, m_reliable(reliable)
, m_readyState(ReadyStateConnecting)
, m_bufferedAmount(0)
@@ -50,9 +51,10 @@
void RTCDataChannelDescriptor::readyStateChanged(ReadyState readyState)
{
ASSERT(m_readyState != ReadyStateClosed);
- if (m_readyState != readyState && m_client) {
+ if (m_readyState != readyState) {
m_readyState = readyState;
- m_client->readyStateChanged();
+ if (m_client)
+ m_client->readyStateChanged();
}
}
Modified: trunk/Source/WebCore/platform/mediastream/chromium/RTCPeerConnectionHandlerChromium.cpp (134804 => 134805)
--- trunk/Source/WebCore/platform/mediastream/chromium/RTCPeerConnectionHandlerChromium.cpp 2012-11-15 19:20:16 UTC (rev 134804)
+++ trunk/Source/WebCore/platform/mediastream/chromium/RTCPeerConnectionHandlerChromium.cpp 2012-11-15 19:22:49 UTC (rev 134805)
@@ -208,6 +208,11 @@
m_client->didRemoveRemoteStream(webMediaStreamDescriptor);
}
+void RTCPeerConnectionHandlerChromium::didAddRemoteDataChannel(const WebKit::WebRTCDataChannel& dataChannel)
+{
+ m_client->didAddRemoteDataChannel(dataChannel);
+}
+
} // namespace WebCore
#endif // ENABLE(MEDIA_STREAM)
Modified: trunk/Source/WebCore/platform/mediastream/chromium/RTCPeerConnectionHandlerChromium.h (134804 => 134805)
--- trunk/Source/WebCore/platform/mediastream/chromium/RTCPeerConnectionHandlerChromium.h 2012-11-15 19:20:16 UTC (rev 134804)
+++ trunk/Source/WebCore/platform/mediastream/chromium/RTCPeerConnectionHandlerChromium.h 2012-11-15 19:22:49 UTC (rev 134805)
@@ -42,6 +42,7 @@
namespace WebKit {
class WebMediaStreamDescriptor;
+class WebRTCDataChannel;
class WebRTCICECandidate;
}
@@ -82,6 +83,7 @@
virtual void didChangeICEState(WebKit::WebRTCPeerConnectionHandlerClient::ICEState) OVERRIDE;
virtual void didAddRemoteStream(const WebKit::WebMediaStreamDescriptor&) OVERRIDE;
virtual void didRemoveRemoteStream(const WebKit::WebMediaStreamDescriptor&) OVERRIDE;
+ virtual void didAddRemoteDataChannel(const WebKit::WebRTCDataChannel&) OVERRIDE;
static WebKit::WebRTCPeerConnectionHandler* toWebRTCPeerConnectionHandler(RTCPeerConnectionHandler*);
Modified: trunk/Tools/ChangeLog (134804 => 134805)
--- trunk/Tools/ChangeLog 2012-11-15 19:20:16 UTC (rev 134804)
+++ trunk/Tools/ChangeLog 2012-11-15 19:22:49 UTC (rev 134805)
@@ -1,3 +1,15 @@
+2012-11-15 Tommy Widenflycht <[email protected]>
+
+ [chromium] MediaStream API: Add missing WebRTCPeerConnectionHandlerClient::didAddRemoteDataChannel
+ https://bugs.webkit.org/show_bug.cgi?id=102386
+
+ Reviewed by Adam Barth.
+
+ Adding mock data channel functionality.
+
+ * DumpRenderTree/chromium/MockWebRTCPeerConnectionHandler.cpp:
+ (MockWebRTCPeerConnectionHandler::openDataChannel):
+
2012-11-15 Sheriff Bot <[email protected]>
Unreviewed, rolling out r134649 and r134665.
Modified: trunk/Tools/DumpRenderTree/chromium/MockWebRTCPeerConnectionHandler.cpp (134804 => 134805)
--- trunk/Tools/DumpRenderTree/chromium/MockWebRTCPeerConnectionHandler.cpp 2012-11-15 19:20:16 UTC (rev 134804)
+++ trunk/Tools/DumpRenderTree/chromium/MockWebRTCPeerConnectionHandler.cpp 2012-11-15 19:22:49 UTC (rev 134805)
@@ -337,6 +337,11 @@
if (m_stopped)
return false;
+ WebRTCDataChannel remoteDataChannel;
+ remoteDataChannel.initialize("MockRemoteDataChannel", dataChannel.reliable());
+ remoteDataChannel.readyStateChanged(WebRTCDataChannel::ReadyStateOpen);
+ m_client->didAddRemoteDataChannel(remoteDataChannel);
+
postTask(new DataChannelReadyStateTask(this, dataChannel, WebRTCDataChannel::ReadyStateOpen));
return true;
}
