Diff
Modified: trunk/LayoutTests/ChangeLog (134809 => 134810)
--- trunk/LayoutTests/ChangeLog 2012-11-15 19:57:07 UTC (rev 134809)
+++ trunk/LayoutTests/ChangeLog 2012-11-15 19:59:56 UTC (rev 134810)
@@ -1,3 +1,16 @@
+2012-11-15 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r134800 and r134805.
+ http://trac.webkit.org/changeset/134800
+ http://trac.webkit.org/changeset/134805
+ https://bugs.webkit.org/show_bug.cgi?id=102417
+
+ This patch broke chromium port (Requested by jianli on
+ #webkit).
+
+ * fast/mediastream/RTCPeerConnection-datachannel-expected.txt:
+ * fast/mediastream/RTCPeerConnection-datachannel.html:
+
2012-11-15 Tommy Widenflycht <[email protected]>
[chromium] MediaStream API: Add missing WebRTCPeerConnectionHandlerClient::didAddRemoteDataChannel
Modified: trunk/LayoutTests/fast/mediastream/RTCPeerConnection-datachannel-expected.txt (134809 => 134810)
--- trunk/LayoutTests/fast/mediastream/RTCPeerConnection-datachannel-expected.txt 2012-11-15 19:57:07 UTC (rev 134809)
+++ trunk/LayoutTests/fast/mediastream/RTCPeerConnection-datachannel-expected.txt 2012-11-15 19:59:56 UTC (rev 134810)
@@ -3,14 +3,12 @@
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 (134809 => 134810)
--- trunk/LayoutTests/fast/mediastream/RTCPeerConnection-datachannel.html 2012-11-15 19:57:07 UTC (rev 134809)
+++ trunk/LayoutTests/fast/mediastream/RTCPeerConnection-datachannel.html 2012-11-15 19:59:56 UTC (rev 134810)
@@ -68,32 +68,25 @@
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("label");
+ dc = pc.createDataChannel("label1");
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 (134809 => 134810)
--- trunk/Source/Platform/ChangeLog 2012-11-15 19:57:07 UTC (rev 134809)
+++ trunk/Source/Platform/ChangeLog 2012-11-15 19:59:56 UTC (rev 134810)
@@ -1,3 +1,16 @@
+2012-11-15 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r134800 and r134805.
+ http://trac.webkit.org/changeset/134800
+ http://trac.webkit.org/changeset/134805
+ https://bugs.webkit.org/show_bug.cgi?id=102417
+
+ This patch broke chromium port (Requested by jianli on
+ #webkit).
+
+ * chromium/public/WebRTCPeerConnectionHandlerClient.h:
+ (WebRTCPeerConnectionHandlerClient):
+
2012-11-15 Tommy Widenflycht <[email protected]>
[chromium] MediaStream API: Add missing WebRTCPeerConnectionHandlerClient::didAddRemoteDataChannel
Modified: trunk/Source/Platform/chromium/public/WebRTCPeerConnectionHandlerClient.h (134809 => 134810)
--- trunk/Source/Platform/chromium/public/WebRTCPeerConnectionHandlerClient.h 2012-11-15 19:57:07 UTC (rev 134809)
+++ trunk/Source/Platform/chromium/public/WebRTCPeerConnectionHandlerClient.h 2012-11-15 19:59:56 UTC (rev 134810)
@@ -39,48 +39,31 @@
public:
enum ReadyState {
ReadyStateNew = 1,
- ReadyStateHaveLocalOffer = 2,
- ReadyStateHaveLocalPrAnswer = 3,
- ReadyStateHaveRemotePrAnswer = 4,
- ReadyStateActive = 5,
- ReadyStateClosed = 6,
-
- // DEPRECATED
- ReadyStateClosing = 7,
- ReadyStateOpening = 8
+ ReadyStateOpening = 2,
+ ReadyStateActive = 3,
+ ReadyStateClosing = 4,
+ ReadyStateClosed = 5
};
enum ICEState {
- ICEStateStarting = 1,
- ICEStateChecking = 2,
- ICEStateConnected = 3,
- ICEStateCompleted = 4,
- ICEStateFailed = 5,
- ICEStateDisconnected = 6,
- ICEStateClosed = 7,
-
- // DEPRECATED
- ICEStateNew = 8,
- ICEStateGathering = 9,
- ICEStateWaiting = 10
+ ICEStateNew = 1,
+ ICEStateGathering = 2,
+ ICEStateWaiting = 3,
+ ICEStateChecking = 4,
+ ICEStateConnected = 5,
+ ICEStateCompleted = 6,
+ ICEStateFailed = 7,
+ ICEStateClosed = 8
};
- enum ICEGatheringState {
- ICEGatheringStateNew = 1,
- ICEGatheringStateGathering = 2,
- ICEGatheringStateComplete = 3
- };
-
virtual ~WebRTCPeerConnectionHandlerClient() { }
virtual void negotiationNeeded() = 0;
virtual void didGenerateICECandidate(const WebRTCICECandidate&) = 0;
virtual void didChangeReadyState(ReadyState) = 0;
- virtual void didChangeICEGatheringState(ICEGatheringState) = 0;
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 (134809 => 134810)
--- trunk/Source/WebCore/ChangeLog 2012-11-15 19:57:07 UTC (rev 134809)
+++ trunk/Source/WebCore/ChangeLog 2012-11-15 19:59:56 UTC (rev 134810)
@@ -1,3 +1,44 @@
+2012-11-15 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r134800 and r134805.
+ http://trac.webkit.org/changeset/134800
+ http://trac.webkit.org/changeset/134805
+ https://bugs.webkit.org/show_bug.cgi?id=102417
+
+ This patch broke chromium port (Requested by jianli on
+ #webkit).
+
+ * 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::iceState):
+ (WebCore::RTCPeerConnection::addStream):
+ (WebCore::RTCPeerConnection::close):
+ (WebCore::RTCPeerConnection::stop):
+ (WebCore::RTCPeerConnection::changeReadyState):
+ (WebCore::RTCPeerConnection::scheduledEventTimerFired):
+ * Modules/mediastream/RTCPeerConnection.h:
+ (RTCPeerConnection):
+ * Modules/mediastream/RTCPeerConnection.idl:
+ * dom/EventNames.h:
+ (WebCore):
+ * platform/mediastream/RTCDataChannelDescriptor.cpp:
+ (WebCore::RTCDataChannelDescriptor::RTCDataChannelDescriptor):
+ (WebCore::RTCDataChannelDescriptor::readyStateChanged):
+ * platform/mediastream/RTCPeerConnectionHandlerClient.h:
+ (RTCPeerConnectionHandlerClient):
+ * platform/mediastream/chromium/RTCPeerConnectionHandlerChromium.cpp:
+ * platform/mediastream/chromium/RTCPeerConnectionHandlerChromium.h:
+ (RTCPeerConnectionHandlerChromium):
+
2012-11-15 Elliott Sprehn <[email protected]>
Remove Node::aboutToUnload and be more explicit about what it was for
Modified: trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp (134809 => 134810)
--- trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp 2012-11-15 19:57:07 UTC (rev 134809)
+++ trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp 2012-11-15 19:59:56 UTC (rev 134810)
@@ -131,12 +131,10 @@
RTCPeerConnection::RTCPeerConnection(ScriptExecutionContext* context, PassRefPtr<RTCConfiguration> configuration, PassRefPtr<MediaConstraints> constraints, ExceptionCode& ec)
: ActiveDOMObject(context, this)
, m_readyState(ReadyStateNew)
- , m_iceGatheringState(IceGatheringStateNew)
- , m_iceState(IceStateStarting)
+ , m_iceState(IceStateClosed)
, m_localStreams(MediaStreamList::create())
, m_remoteStreams(MediaStreamList::create())
, m_scheduledEventTimer(this, &RTCPeerConnection::scheduledEventTimerFired)
- , m_stopped(false)
{
ASSERT(m_scriptExecutionContext->isDocument());
Document* document = static_cast<Document*>(m_scriptExecutionContext);
@@ -166,7 +164,7 @@
void RTCPeerConnection::createOffer(PassRefPtr<RTCSessionDescriptionCallback> successCallback, PassRefPtr<RTCErrorCallback> errorCallback, const Dictionary& mediaConstraints, ExceptionCode& ec)
{
- if (m_readyState == ReadyStateClosed) {
+ if (m_readyState == ReadyStateClosing || m_readyState == ReadyStateClosed) {
ec = INVALID_STATE_ERR;
return;
}
@@ -186,7 +184,7 @@
void RTCPeerConnection::createAnswer(PassRefPtr<RTCSessionDescriptionCallback> successCallback, PassRefPtr<RTCErrorCallback> errorCallback, const Dictionary& mediaConstraints, ExceptionCode& ec)
{
- if (m_readyState == ReadyStateClosed) {
+ if (m_readyState == ReadyStateClosing || m_readyState == ReadyStateClosed) {
ec = INVALID_STATE_ERR;
return;
}
@@ -206,7 +204,7 @@
void RTCPeerConnection::setLocalDescription(PassRefPtr<RTCSessionDescription> prpSessionDescription, PassRefPtr<VoidCallback> successCallback, PassRefPtr<RTCErrorCallback> errorCallback, ExceptionCode& ec)
{
- if (m_readyState == ReadyStateClosed) {
+ if (m_readyState == ReadyStateClosing || m_readyState == ReadyStateClosed) {
ec = INVALID_STATE_ERR;
return;
}
@@ -223,7 +221,7 @@
PassRefPtr<RTCSessionDescription> RTCPeerConnection::localDescription(ExceptionCode& ec)
{
- if (m_readyState == ReadyStateClosed) {
+ if (m_readyState == ReadyStateClosing || m_readyState == ReadyStateClosed) {
ec = INVALID_STATE_ERR;
return 0;
}
@@ -238,7 +236,7 @@
void RTCPeerConnection::setRemoteDescription(PassRefPtr<RTCSessionDescription> prpSessionDescription, PassRefPtr<VoidCallback> successCallback, PassRefPtr<RTCErrorCallback> errorCallback, ExceptionCode& ec)
{
- if (m_readyState == ReadyStateClosed) {
+ if (m_readyState == ReadyStateClosing || m_readyState == ReadyStateClosed) {
ec = INVALID_STATE_ERR;
return;
}
@@ -255,7 +253,7 @@
PassRefPtr<RTCSessionDescription> RTCPeerConnection::remoteDescription(ExceptionCode& ec)
{
- if (m_readyState == ReadyStateClosed) {
+ if (m_readyState == ReadyStateClosing || m_readyState == ReadyStateClosed) {
ec = INVALID_STATE_ERR;
return 0;
}
@@ -270,7 +268,7 @@
void RTCPeerConnection::updateIce(const Dictionary& rtcConfiguration, const Dictionary& mediaConstraints, ExceptionCode& ec)
{
- if (m_readyState == ReadyStateClosed) {
+ if (m_readyState == ReadyStateClosing || m_readyState == ReadyStateClosed) {
ec = INVALID_STATE_ERR;
return;
}
@@ -290,7 +288,7 @@
void RTCPeerConnection::addIceCandidate(RTCIceCandidate* iceCandidate, ExceptionCode& ec)
{
- if (m_readyState == ReadyStateClosed) {
+ if (m_readyState == ReadyStateClosing || m_readyState == ReadyStateClosed) {
ec = INVALID_STATE_ERR;
return;
}
@@ -310,48 +308,29 @@
switch (m_readyState) {
case ReadyStateNew:
return ASCIILiteral("new");
- case ReadyStateHaveLocalOffer:
- return ASCIILiteral("have-local-offer");
- case ReadyStateHaveLocalPrAnswer:
- return ASCIILiteral("have-local-pranswer");
- case ReadyStateHaveRemotePrAnswer:
- return ASCIILiteral("have-remote-pranswer");
- case ReadyStateActive:
- return ASCIILiteral("active");
- case ReadyStateClosed:
- return ASCIILiteral("closed");
-
- // DEPRECATED
case ReadyStateOpening:
return ASCIILiteral("opening");
+ case ReadyStateActive:
+ return ASCIILiteral("active");
case ReadyStateClosing:
return ASCIILiteral("closing");
+ case ReadyStateClosed:
+ return ASCIILiteral("closed");
}
ASSERT_NOT_REACHED();
- return String();
+ return ASCIILiteral("");
}
-String RTCPeerConnection::iceGatheringState() const
-{
- switch (m_iceGatheringState) {
- case IceGatheringStateNew:
- return ASCIILiteral("new");
- case IceGatheringStateGathering:
- return ASCIILiteral("gathering");
- case IceGatheringStateComplete:
- return ASCIILiteral("complete");
- }
-
- ASSERT_NOT_REACHED();
- return String();
-}
-
String RTCPeerConnection::iceState() const
{
switch (m_iceState) {
- case IceStateStarting:
- return ASCIILiteral("starting");
+ case IceStateNew:
+ return ASCIILiteral("new");
+ case IceStateGathering:
+ return ASCIILiteral("gathering");
+ case IceStateWaiting:
+ return ASCIILiteral("waiting");
case IceStateChecking:
return ASCIILiteral("checking");
case IceStateConnected:
@@ -360,18 +339,8 @@
return ASCIILiteral("completed");
case IceStateFailed:
return ASCIILiteral("failed");
- case IceStateDisconnected:
- return ASCIILiteral("disconnected");
case IceStateClosed:
return ASCIILiteral("closed");
-
- // DEPRECATED
- case IceStateNew:
- return ASCIILiteral("new");
- case IceStateGathering:
- return ASCIILiteral("gathering");
- case IceStateWaiting:
- return ASCIILiteral("waiting");
}
ASSERT_NOT_REACHED();
@@ -380,7 +349,7 @@
void RTCPeerConnection::addStream(PassRefPtr<MediaStream> prpStream, const Dictionary& mediaConstraints, ExceptionCode& ec)
{
- if (m_readyState == ReadyStateClosed) {
+ if (m_readyState == ReadyStateClosing || m_readyState == ReadyStateClosed) {
ec = INVALID_STATE_ERR;
return;
}
@@ -460,7 +429,7 @@
void RTCPeerConnection::close(ExceptionCode& ec)
{
- if (m_readyState == ReadyStateClosed) {
+ if (m_readyState == ReadyStateClosing || m_readyState == ReadyStateClosed) {
ec = INVALID_STATE_ERR;
return;
}
@@ -493,16 +462,6 @@
changeReadyState(newState);
}
-void RTCPeerConnection::didChangeIceGatheringState(IceGatheringState newState)
-{
- ASSERT(scriptExecutionContext()->isContextThread());
- if (newState == m_iceGatheringState || m_readyState == ReadyStateClosed)
- return;
-
- m_iceGatheringState = newState;
- scheduleDispatchEvent(Event::create(eventNames().gatheringchangeEvent, false, false));
-}
-
void RTCPeerConnection::didChangeIceState(IceState newState)
{
ASSERT(scriptExecutionContext()->isContextThread());
@@ -564,7 +523,6 @@
void RTCPeerConnection::stop()
{
- m_stopped = true;
m_iceState = IceStateClosed;
m_readyState = ReadyStateClosed;
@@ -585,18 +543,24 @@
void RTCPeerConnection::changeReadyState(ReadyState readyState)
{
- if (readyState == ReadyStateNew) {
- ASSERT_NOT_REACHED();
- return;
- }
-
if (readyState == m_readyState || m_readyState == ReadyStateClosed)
return;
m_readyState = readyState;
- if (m_readyState == ReadyStateActive)
+ switch (m_readyState) {
+ case ReadyStateOpening:
+ break;
+ case ReadyStateActive:
scheduleDispatchEvent(Event::create(eventNames().openEvent, false, false));
+ break;
+ case ReadyStateClosing:
+ case ReadyStateClosed:
+ break;
+ case ReadyStateNew:
+ ASSERT_NOT_REACHED();
+ break;
+ }
scheduleDispatchEvent(Event::create(eventNames().statechangeEvent, false, false));
}
@@ -620,9 +584,6 @@
void RTCPeerConnection::scheduledEventTimerFired(Timer<RTCPeerConnection>*)
{
- if (m_stopped)
- return;
-
Vector<RefPtr<Event> > events;
events.swap(m_scheduledEvents);
Modified: trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.h (134809 => 134810)
--- trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.h 2012-11-15 19:57:07 UTC (rev 134809)
+++ trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.h 2012-11-15 19:59:56 UTC (rev 134810)
@@ -78,8 +78,6 @@
void addIceCandidate(RTCIceCandidate*, ExceptionCode&);
- String iceGatheringState() const;
-
String iceState() const;
MediaStreamList* localStreams() const;
@@ -102,7 +100,6 @@
DEFINE_ATTRIBUTE_EVENT_LISTENER(statechange);
DEFINE_ATTRIBUTE_EVENT_LISTENER(addstream);
DEFINE_ATTRIBUTE_EVENT_LISTENER(removestream);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(gatheringchange);
DEFINE_ATTRIBUTE_EVENT_LISTENER(icechange);
DEFINE_ATTRIBUTE_EVENT_LISTENER(datachannel);
@@ -110,7 +107,6 @@
virtual void negotiationNeeded() OVERRIDE;
virtual void didGenerateIceCandidate(PassRefPtr<RTCIceCandidateDescriptor>) OVERRIDE;
virtual void didChangeReadyState(ReadyState) OVERRIDE;
- virtual void didChangeIceGatheringState(IceGatheringState) OVERRIDE;
virtual void didChangeIceState(IceState) OVERRIDE;
virtual void didAddRemoteStream(PassRefPtr<MediaStreamDescriptor>) OVERRIDE;
virtual void didRemoveRemoteStream(MediaStreamDescriptor*) OVERRIDE;
@@ -144,7 +140,6 @@
void changeIceState(IceState);
ReadyState m_readyState;
- IceGatheringState m_iceGatheringState;
IceState m_iceState;
RefPtr<MediaStreamList> m_localStreams;
@@ -156,8 +151,6 @@
Timer<RTCPeerConnection> m_scheduledEventTimer;
Vector<RefPtr<Event> > m_scheduledEvents;
-
- bool m_stopped;
};
} // namespace WebCore
Modified: trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.idl (134809 => 134810)
--- trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.idl 2012-11-15 19:57:07 UTC (rev 134809)
+++ trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.idl 2012-11-15 19:59:56 UTC (rev 134810)
@@ -60,7 +60,6 @@
void addIceCandidate(in RTCIceCandidate candidate)
raises(DOMException);
- readonly attribute DOMString iceGatheringState;
readonly attribute DOMString iceState;
readonly attribute MediaStreamList localStreams;
@@ -85,7 +84,6 @@
attribute EventListener onstatechange;
attribute EventListener onaddstream;
attribute EventListener onremovestream;
- attribute EventListener ongatheringchange;
attribute EventListener onicechange;
attribute EventListener ondatachannel;
Modified: trunk/Source/WebCore/dom/EventNames.h (134809 => 134810)
--- trunk/Source/WebCore/dom/EventNames.h 2012-11-15 19:57:07 UTC (rev 134809)
+++ trunk/Source/WebCore/dom/EventNames.h 2012-11-15 19:59:56 UTC (rev 134810)
@@ -229,7 +229,6 @@
macro(icecandidate) \
macro(negotiationneeded) \
macro(datachannel) \
- macro(gatheringchange) \
\
macro(show) \
\
Modified: trunk/Source/WebCore/platform/mediastream/RTCDataChannelDescriptor.cpp (134809 => 134810)
--- trunk/Source/WebCore/platform/mediastream/RTCDataChannelDescriptor.cpp 2012-11-15 19:57:07 UTC (rev 134809)
+++ trunk/Source/WebCore/platform/mediastream/RTCDataChannelDescriptor.cpp 2012-11-15 19:59:56 UTC (rev 134810)
@@ -36,8 +36,7 @@
}
RTCDataChannelDescriptor::RTCDataChannelDescriptor(const String& label, bool reliable)
- : m_client(0)
- , m_label(label)
+ : m_label(label)
, m_reliable(reliable)
, m_readyState(ReadyStateConnecting)
, m_bufferedAmount(0)
@@ -51,10 +50,9 @@
void RTCDataChannelDescriptor::readyStateChanged(ReadyState readyState)
{
ASSERT(m_readyState != ReadyStateClosed);
- if (m_readyState != readyState) {
+ if (m_readyState != readyState && m_client) {
m_readyState = readyState;
- if (m_client)
- m_client->readyStateChanged();
+ m_client->readyStateChanged();
}
}
Modified: trunk/Source/WebCore/platform/mediastream/RTCPeerConnectionHandlerClient.h (134809 => 134810)
--- trunk/Source/WebCore/platform/mediastream/RTCPeerConnectionHandlerClient.h 2012-11-15 19:57:07 UTC (rev 134809)
+++ trunk/Source/WebCore/platform/mediastream/RTCPeerConnectionHandlerClient.h 2012-11-15 19:59:56 UTC (rev 134810)
@@ -45,44 +45,28 @@
public:
enum ReadyState {
ReadyStateNew = 1,
- ReadyStateHaveLocalOffer = 2,
- ReadyStateHaveLocalPrAnswer = 3,
- ReadyStateHaveRemotePrAnswer = 4,
- ReadyStateActive = 5,
- ReadyStateClosed = 6,
-
- // DEPRECATED
- ReadyStateClosing = 7,
- ReadyStateOpening = 8
+ ReadyStateOpening = 2,
+ ReadyStateActive = 3,
+ ReadyStateClosing = 4,
+ ReadyStateClosed = 5
};
enum IceState {
- IceStateStarting = 1,
- IceStateChecking = 2,
- IceStateConnected = 3,
- IceStateCompleted = 4,
- IceStateFailed = 5,
- IceStateDisconnected = 6,
- IceStateClosed = 7,
-
- // DEPRECATED
- IceStateNew = 8,
- IceStateGathering = 9,
- IceStateWaiting = 10
+ IceStateNew = 1,
+ IceStateGathering = 2,
+ IceStateWaiting = 3,
+ IceStateChecking = 4,
+ IceStateConnected = 5,
+ IceStateCompleted = 6,
+ IceStateFailed = 7,
+ IceStateClosed = 8
};
- enum IceGatheringState {
- IceGatheringStateNew = 1,
- IceGatheringStateGathering = 2,
- IceGatheringStateComplete = 3
- };
-
virtual ~RTCPeerConnectionHandlerClient() { }
virtual void negotiationNeeded() = 0;
virtual void didGenerateIceCandidate(PassRefPtr<RTCIceCandidateDescriptor>) = 0;
virtual void didChangeReadyState(ReadyState) = 0;
- virtual void didChangeIceGatheringState(IceGatheringState) = 0;
virtual void didChangeIceState(IceState) = 0;
virtual void didAddRemoteStream(PassRefPtr<MediaStreamDescriptor>) = 0;
virtual void didRemoveRemoteStream(MediaStreamDescriptor*) = 0;
Modified: trunk/Source/WebCore/platform/mediastream/chromium/RTCPeerConnectionHandlerChromium.cpp (134809 => 134810)
--- trunk/Source/WebCore/platform/mediastream/chromium/RTCPeerConnectionHandlerChromium.cpp 2012-11-15 19:57:07 UTC (rev 134809)
+++ trunk/Source/WebCore/platform/mediastream/chromium/RTCPeerConnectionHandlerChromium.cpp 2012-11-15 19:59:56 UTC (rev 134810)
@@ -188,11 +188,6 @@
m_client->didChangeReadyState(static_cast<RTCPeerConnectionHandlerClient::ReadyState>(state));
}
-void RTCPeerConnectionHandlerChromium::didChangeICEGatheringState(WebKit::WebRTCPeerConnectionHandlerClient::ICEGatheringState state)
-{
- m_client->didChangeIceGatheringState(static_cast<RTCPeerConnectionHandlerClient::IceGatheringState>(state));
-}
-
void RTCPeerConnectionHandlerChromium::didChangeICEState(WebKit::WebRTCPeerConnectionHandlerClient::ICEState state)
{
m_client->didChangeIceState(static_cast<RTCPeerConnectionHandlerClient::IceState>(state));
@@ -208,11 +203,6 @@
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 (134809 => 134810)
--- trunk/Source/WebCore/platform/mediastream/chromium/RTCPeerConnectionHandlerChromium.h 2012-11-15 19:57:07 UTC (rev 134809)
+++ trunk/Source/WebCore/platform/mediastream/chromium/RTCPeerConnectionHandlerChromium.h 2012-11-15 19:59:56 UTC (rev 134810)
@@ -42,7 +42,6 @@
namespace WebKit {
class WebMediaStreamDescriptor;
-class WebRTCDataChannel;
class WebRTCICECandidate;
}
@@ -79,11 +78,9 @@
virtual void negotiationNeeded() OVERRIDE;
virtual void didGenerateICECandidate(const WebKit::WebRTCICECandidate&) OVERRIDE;
virtual void didChangeReadyState(WebKit::WebRTCPeerConnectionHandlerClient::ReadyState) OVERRIDE;
- virtual void didChangeICEGatheringState(WebKit::WebRTCPeerConnectionHandlerClient::ICEGatheringState) OVERRIDE;
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/Source/WebKit/chromium/ChangeLog (134809 => 134810)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-11-15 19:57:07 UTC (rev 134809)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-11-15 19:59:56 UTC (rev 134810)
@@ -1,3 +1,15 @@
+2012-11-15 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r134800 and r134805.
+ http://trac.webkit.org/changeset/134800
+ http://trac.webkit.org/changeset/134805
+ https://bugs.webkit.org/show_bug.cgi?id=102417
+
+ This patch broke chromium port (Requested by jianli on
+ #webkit).
+
+ * src/AssertMatchingEnums.cpp:
+
2012-11-15 Sadrul Habib Chowdhury <[email protected]>
[chromium] Do not mark an event (mouse wheel, scroll update) as handled if nothing was scrolled.
Modified: trunk/Source/WebKit/chromium/src/AssertMatchingEnums.cpp (134809 => 134810)
--- trunk/Source/WebKit/chromium/src/AssertMatchingEnums.cpp 2012-11-15 19:57:07 UTC (rev 134809)
+++ trunk/Source/WebKit/chromium/src/AssertMatchingEnums.cpp 2012-11-15 19:59:56 UTC (rev 134810)
@@ -563,30 +563,20 @@
COMPILE_ASSERT_MATCHING_ENUM(WebMediaStreamSource::ReadyStateEnded, MediaStreamSource::ReadyStateEnded);
COMPILE_ASSERT_MATCHING_ENUM(WebRTCPeerConnectionHandlerClient::ReadyStateNew, RTCPeerConnectionHandlerClient::ReadyStateNew);
-COMPILE_ASSERT_MATCHING_ENUM(WebRTCPeerConnectionHandlerClient::ReadyStateHaveLocalOffer, RTCPeerConnectionHandlerClient::ReadyStateHaveLocalOffer);
-COMPILE_ASSERT_MATCHING_ENUM(WebRTCPeerConnectionHandlerClient::ReadyStateHaveLocalPrAnswer, RTCPeerConnectionHandlerClient::ReadyStateHaveLocalPrAnswer);
-COMPILE_ASSERT_MATCHING_ENUM(WebRTCPeerConnectionHandlerClient::ReadyStateHaveRemotePrAnswer, RTCPeerConnectionHandlerClient::ReadyStateHaveRemotePrAnswer);
+COMPILE_ASSERT_MATCHING_ENUM(WebRTCPeerConnectionHandlerClient::ReadyStateOpening, RTCPeerConnectionHandlerClient::ReadyStateOpening);
COMPILE_ASSERT_MATCHING_ENUM(WebRTCPeerConnectionHandlerClient::ReadyStateActive, RTCPeerConnectionHandlerClient::ReadyStateActive);
+COMPILE_ASSERT_MATCHING_ENUM(WebRTCPeerConnectionHandlerClient::ReadyStateClosing, RTCPeerConnectionHandlerClient::ReadyStateClosing);
COMPILE_ASSERT_MATCHING_ENUM(WebRTCPeerConnectionHandlerClient::ReadyStateClosed, RTCPeerConnectionHandlerClient::ReadyStateClosed);
-// DEPRECATED
-COMPILE_ASSERT_MATCHING_ENUM(WebRTCPeerConnectionHandlerClient::ReadyStateOpening, RTCPeerConnectionHandlerClient::ReadyStateOpening);
-COMPILE_ASSERT_MATCHING_ENUM(WebRTCPeerConnectionHandlerClient::ReadyStateClosing, RTCPeerConnectionHandlerClient::ReadyStateClosing);
-
-
-COMPILE_ASSERT_MATCHING_ENUM(WebRTCPeerConnectionHandlerClient::ICEStateStarting, RTCPeerConnectionHandlerClient::IceStateStarting);
+COMPILE_ASSERT_MATCHING_ENUM(WebRTCPeerConnectionHandlerClient::ICEStateNew, RTCPeerConnectionHandlerClient::IceStateNew);
+COMPILE_ASSERT_MATCHING_ENUM(WebRTCPeerConnectionHandlerClient::ICEStateGathering, RTCPeerConnectionHandlerClient::IceStateGathering);
+COMPILE_ASSERT_MATCHING_ENUM(WebRTCPeerConnectionHandlerClient::ICEStateWaiting, RTCPeerConnectionHandlerClient::IceStateWaiting);
COMPILE_ASSERT_MATCHING_ENUM(WebRTCPeerConnectionHandlerClient::ICEStateChecking, RTCPeerConnectionHandlerClient::IceStateChecking);
COMPILE_ASSERT_MATCHING_ENUM(WebRTCPeerConnectionHandlerClient::ICEStateConnected, RTCPeerConnectionHandlerClient::IceStateConnected);
COMPILE_ASSERT_MATCHING_ENUM(WebRTCPeerConnectionHandlerClient::ICEStateCompleted, RTCPeerConnectionHandlerClient::IceStateCompleted);
COMPILE_ASSERT_MATCHING_ENUM(WebRTCPeerConnectionHandlerClient::ICEStateFailed, RTCPeerConnectionHandlerClient::IceStateFailed);
-COMPILE_ASSERT_MATCHING_ENUM(WebRTCPeerConnectionHandlerClient::ICEStateDisconnected, RTCPeerConnectionHandlerClient::IceStateDisconnected);
COMPILE_ASSERT_MATCHING_ENUM(WebRTCPeerConnectionHandlerClient::ICEStateClosed, RTCPeerConnectionHandlerClient::IceStateClosed);
-// DEPRECATED
-COMPILE_ASSERT_MATCHING_ENUM(WebRTCPeerConnectionHandlerClient::ICEStateNew, RTCPeerConnectionHandlerClient::IceStateNew);
-COMPILE_ASSERT_MATCHING_ENUM(WebRTCPeerConnectionHandlerClient::ICEStateGathering, RTCPeerConnectionHandlerClient::IceStateGathering);
-COMPILE_ASSERT_MATCHING_ENUM(WebRTCPeerConnectionHandlerClient::ICEStateWaiting, RTCPeerConnectionHandlerClient::IceStateWaiting);
-
COMPILE_ASSERT_MATCHING_ENUM(WebRTCDataChannel::ReadyStateConnecting, RTCDataChannelDescriptor::ReadyStateConnecting);
COMPILE_ASSERT_MATCHING_ENUM(WebRTCDataChannel::ReadyStateOpen, RTCDataChannelDescriptor::ReadyStateOpen);
COMPILE_ASSERT_MATCHING_ENUM(WebRTCDataChannel::ReadyStateClosing, RTCDataChannelDescriptor::ReadyStateClosing);
Modified: trunk/Tools/ChangeLog (134809 => 134810)
--- trunk/Tools/ChangeLog 2012-11-15 19:57:07 UTC (rev 134809)
+++ trunk/Tools/ChangeLog 2012-11-15 19:59:56 UTC (rev 134810)
@@ -1,3 +1,16 @@
+2012-11-15 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r134800 and r134805.
+ http://trac.webkit.org/changeset/134800
+ http://trac.webkit.org/changeset/134805
+ https://bugs.webkit.org/show_bug.cgi?id=102417
+
+ This patch broke chromium port (Requested by jianli on
+ #webkit).
+
+ * DumpRenderTree/chromium/MockWebRTCPeerConnectionHandler.cpp:
+ (MockWebRTCPeerConnectionHandler::openDataChannel):
+
2012-11-15 Tommy Widenflycht <[email protected]>
[chromium] MediaStream API: Add missing WebRTCPeerConnectionHandlerClient::didAddRemoteDataChannel
Modified: trunk/Tools/DumpRenderTree/chromium/MockWebRTCPeerConnectionHandler.cpp (134809 => 134810)
--- trunk/Tools/DumpRenderTree/chromium/MockWebRTCPeerConnectionHandler.cpp 2012-11-15 19:57:07 UTC (rev 134809)
+++ trunk/Tools/DumpRenderTree/chromium/MockWebRTCPeerConnectionHandler.cpp 2012-11-15 19:59:56 UTC (rev 134810)
@@ -337,11 +337,6 @@
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;
}
