Diff
Modified: trunk/Source/Platform/ChangeLog (138737 => 138738)
--- trunk/Source/Platform/ChangeLog 2013-01-03 22:04:39 UTC (rev 138737)
+++ trunk/Source/Platform/ChangeLog 2013-01-03 22:05:35 UTC (rev 138738)
@@ -1,3 +1,14 @@
+2013-01-03 Tommy Widenflycht <tom...@google.com>
+
+ MediaStream API: Add a missing state to RTCPeerConnection
+ https://bugs.webkit.org/show_bug.cgi?id=106017
+
+ Reviewed by Adam Barth.
+
+ Adding the missing ReadyStateHaveRemoteOffer which will show up in the spec soon.
+
+ * chromium/public/WebRTCPeerConnectionHandlerClient.h:
+
2013-01-02 James Robinson <jam...@chromium.org>
[chromium] Remove unused transitional #defines from Platform API
Modified: trunk/Source/Platform/chromium/public/WebRTCPeerConnectionHandlerClient.h (138737 => 138738)
--- trunk/Source/Platform/chromium/public/WebRTCPeerConnectionHandlerClient.h 2013-01-03 22:04:39 UTC (rev 138737)
+++ trunk/Source/Platform/chromium/public/WebRTCPeerConnectionHandlerClient.h 2013-01-03 22:05:35 UTC (rev 138738)
@@ -41,14 +41,15 @@
enum ReadyState {
ReadyStateNew = 1,
ReadyStateHaveLocalOffer = 2,
- ReadyStateHaveLocalPrAnswer = 3,
- ReadyStateHaveRemotePrAnswer = 4,
- ReadyStateActive = 5,
- ReadyStateClosed = 6,
+ ReadyStateHaveRemoteOffer = 3,
+ ReadyStateHaveLocalPrAnswer = 4,
+ ReadyStateHaveRemotePrAnswer = 5,
+ ReadyStateActive = 6,
+ ReadyStateClosed = 7,
// DEPRECATED
- ReadyStateClosing = 7,
- ReadyStateOpening = 8
+ ReadyStateClosing = 8,
+ ReadyStateOpening = 9
};
enum ICEState {
Modified: trunk/Source/WebCore/ChangeLog (138737 => 138738)
--- trunk/Source/WebCore/ChangeLog 2013-01-03 22:04:39 UTC (rev 138737)
+++ trunk/Source/WebCore/ChangeLog 2013-01-03 22:05:35 UTC (rev 138738)
@@ -1,3 +1,18 @@
+2013-01-03 Tommy Widenflycht <tom...@google.com>
+
+ MediaStream API: Add a missing state to RTCPeerConnection
+ https://bugs.webkit.org/show_bug.cgi?id=106017
+
+ Reviewed by Adam Barth.
+
+ Adding the missing ReadyStateHaveRemoteOffer which will show up in the spec soon.
+
+ Not testable, just another state.
+
+ * Modules/mediastream/RTCPeerConnection.cpp:
+ (WebCore::RTCPeerConnection::readyState):
+ * platform/mediastream/RTCPeerConnectionHandlerClient.h:
+
2013-01-03 Emil A Eklund <e...@chromium.org>
Fix overflow in LayoutUnit::ceil and floor for SATURATED_LAYOUT_ARITHMETIC
Modified: trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp (138737 => 138738)
--- trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp 2013-01-03 22:04:39 UTC (rev 138737)
+++ trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp 2013-01-03 22:05:35 UTC (rev 138738)
@@ -313,6 +313,8 @@
return ASCIILiteral("new");
case ReadyStateHaveLocalOffer:
return ASCIILiteral("have-local-offer");
+ case ReadyStateHaveRemoteOffer:
+ return ASCIILiteral("have-remote-offer");
case ReadyStateHaveLocalPrAnswer:
return ASCIILiteral("have-local-pranswer");
case ReadyStateHaveRemotePrAnswer:
Modified: trunk/Source/WebCore/platform/mediastream/RTCPeerConnectionHandlerClient.h (138737 => 138738)
--- trunk/Source/WebCore/platform/mediastream/RTCPeerConnectionHandlerClient.h 2013-01-03 22:04:39 UTC (rev 138737)
+++ trunk/Source/WebCore/platform/mediastream/RTCPeerConnectionHandlerClient.h 2013-01-03 22:05:35 UTC (rev 138738)
@@ -46,14 +46,15 @@
enum ReadyState {
ReadyStateNew = 1,
ReadyStateHaveLocalOffer = 2,
- ReadyStateHaveLocalPrAnswer = 3,
- ReadyStateHaveRemotePrAnswer = 4,
- ReadyStateActive = 5,
- ReadyStateClosed = 6,
+ ReadyStateHaveRemoteOffer = 3,
+ ReadyStateHaveLocalPrAnswer = 4,
+ ReadyStateHaveRemotePrAnswer = 5,
+ ReadyStateActive = 6,
+ ReadyStateClosed = 7,
// DEPRECATED
- ReadyStateClosing = 7,
- ReadyStateOpening = 8
+ ReadyStateClosing = 8,
+ ReadyStateOpening = 9
};
enum IceState {
Modified: trunk/Source/WebKit/chromium/ChangeLog (138737 => 138738)
--- trunk/Source/WebKit/chromium/ChangeLog 2013-01-03 22:04:39 UTC (rev 138737)
+++ trunk/Source/WebKit/chromium/ChangeLog 2013-01-03 22:05:35 UTC (rev 138738)
@@ -1,3 +1,14 @@
+2013-01-03 Tommy Widenflycht <tom...@google.com>
+
+ MediaStream API: Add a missing state to RTCPeerConnection
+ https://bugs.webkit.org/show_bug.cgi?id=106017
+
+ Reviewed by Adam Barth.
+
+ Adding the missing ReadyStateHaveRemoteOffer which will show up in the spec soon.
+
+ * src/AssertMatchingEnums.cpp:
+
2013-01-03 Joshua Bell <jsb...@chromium.org>
IndexedDB: Simplify IDBTransactionBackendImpl::scheduleTask usage
Modified: trunk/Source/WebKit/chromium/src/AssertMatchingEnums.cpp (138737 => 138738)
--- trunk/Source/WebKit/chromium/src/AssertMatchingEnums.cpp 2013-01-03 22:04:39 UTC (rev 138737)
+++ trunk/Source/WebKit/chromium/src/AssertMatchingEnums.cpp 2013-01-03 22:05:35 UTC (rev 138738)
@@ -564,6 +564,7 @@
COMPILE_ASSERT_MATCHING_ENUM(WebRTCPeerConnectionHandlerClient::ReadyStateNew, RTCPeerConnectionHandlerClient::ReadyStateNew);
COMPILE_ASSERT_MATCHING_ENUM(WebRTCPeerConnectionHandlerClient::ReadyStateHaveLocalOffer, RTCPeerConnectionHandlerClient::ReadyStateHaveLocalOffer);
+COMPILE_ASSERT_MATCHING_ENUM(WebRTCPeerConnectionHandlerClient::ReadyStateHaveRemoteOffer, RTCPeerConnectionHandlerClient::ReadyStateHaveRemoteOffer);
COMPILE_ASSERT_MATCHING_ENUM(WebRTCPeerConnectionHandlerClient::ReadyStateHaveLocalPrAnswer, RTCPeerConnectionHandlerClient::ReadyStateHaveLocalPrAnswer);
COMPILE_ASSERT_MATCHING_ENUM(WebRTCPeerConnectionHandlerClient::ReadyStateHaveRemotePrAnswer, RTCPeerConnectionHandlerClient::ReadyStateHaveRemotePrAnswer);
COMPILE_ASSERT_MATCHING_ENUM(WebRTCPeerConnectionHandlerClient::ReadyStateActive, RTCPeerConnectionHandlerClient::ReadyStateActive);
